drm/i915/dpt: move display/intel_dpt.c to i915_dpt.c

The DPT implementation is i915 specific. The xe driver has a different
implementation. Move display/intel_dpt.c to i915_dpt.c. Cleanups will
follow.

Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Link: https://patch.msgid.link/20a3bfb2762f39f9666d9a5752b8d2fb133583b0.1772030909.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 4d6c528d9881c8c35e43efa436fb2a85894bb34f..f1f504b36374d0cf34882359b7d015edf8c69558 100644 (file)
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -77,6 +77,7 @@ i915-$(CONFIG_PERF_EVENTS) += \
 # core display adaptation
 i915-y += \
        i915_display_pc8.o \
+       i915_dpt.o \
        i915_dsb_buffer.o \
        i915_hdcp_gsc.o \
        i915_initial_plane.o \
@@ -270,7 +271,6 @@ i915-y += \
        display/intel_dpio_phy.o \
        display/intel_dpll.o \
        display/intel_dpll_mgr.o \
-       display/intel_dpt.o \
        display/intel_dpt_common.o \
        display/intel_dram.o \
        display/intel_drrs.o \

diff --git a/drivers/gpu/drm/i915/display/intel_dpt.c b/drivers/gpu/drm/i915/i915_dpt.c
similarity index 97%
rename from drivers/gpu/drm/i915/display/intel_dpt.c
rename to drivers/gpu/drm/i915/i915_dpt.c
index da472371c7d7a05ae5758d91bd37c7b8c8cbfed1..3f764727025c66a3d2b29e65684d46db8720a276 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dpt.c
+++ b/drivers/gpu/drm/i915/i915_dpt.c
@@ -5,17 +5,17 @@
 
 #include <drm/drm_print.h>
 
+#include "display/intel_display_core.h"
+#include "display/intel_display_rpm.h"
+#include "display/intel_display_types.h"
+#include "display/intel_dpt.h"
+#include "display/intel_fb.h"
 #include "gem/i915_gem_domain.h"
 #include "gem/i915_gem_internal.h"
 #include "gem/i915_gem_lmem.h"
 #include "gt/gen8_ppgtt.h"
 
 #include "i915_drv.h"
-#include "intel_display_core.h"
-#include "intel_display_rpm.h"
-#include "intel_display_types.h"
-#include "intel_dpt.h"
-#include "intel_fb.h"
 
 struct i915_dpt {
        struct i915_address_space vm;