drm/i915: Merge i915_dma.c into i915_drv.c

Browse source

i915_dma.c used to contain the DRI1/UMS horror show, but now all that
remains are the out-of-place driver level interfaces (such as
allocating, initialising and registering the driver). These should be in
i915_drv.c alongside similar routines for suspend/resume.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1466773227-7994-10-git-send-email-chris@chris-wilson.co.uk

...

This commit is contained in:

Chris Wilson 2016-06-24 14:00:22 +01:00

parent 091387c1cb

commit 0673ad472b

4 changed files with 1876 additions and 1943 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

drivers/gpu/drm/i915/Makefile

View file

1715

drivers/gpu/drm/i915/i915_dma.c

View file

1689

drivers/gpu/drm/i915/i915_drv.c

View file

16

drivers/gpu/drm/i915/i915_drv.h

View file