Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0673ad47 authored by Chris Wilson's avatar Chris Wilson
Browse files

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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1466773227-7994-10-git-send-email-chris@chris-wilson.co.uk
parent 091387c1
Loading
Loading
Loading
Loading
+0 −3
Original line number Original line Diff line number Diff line
@@ -101,9 +101,6 @@ i915-y += dvo_ch7017.o \
# virtual gpu code
# virtual gpu code
i915-y += i915_vgpu.o
i915-y += i915_vgpu.o


# legacy horrors
i915-y += i915_dma.o

ifeq ($(CONFIG_DRM_I915_GVT),y)
ifeq ($(CONFIG_DRM_I915_GVT),y)
i915-y += intel_gvt.o
i915-y += intel_gvt.o
include $(src)/gvt/Makefile
include $(src)/gvt/Makefile