drm/i915: Merge i915_dma.c into i915_drv.c
authorChris Wilson <chris@chris-wilson.co.uk>
Fri, 24 Jun 2016 13:00:22 +0000 (14:00 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Fri, 24 Jun 2016 13:44:44 +0000 (14:44 +0100)
commit0673ad472b9849ad6dbd83d5e3a3a63aba5db740
tree20f5bc794406dffae62233e892079a6dcfa9be01
parent091387c1cb8b20ca0490bb35210ddb0c3d7d76ff
drm/i915: Merge i915_dma.c into i915_drv.c

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
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/i915_dma.c [deleted file]
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h