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.
Signed-off-by: Jani Nikula <[email protected]> --- drivers/gpu/drm/i915/Makefile | 2 +- .../gpu/drm/i915/{display/intel_dpt.c => i915_dpt.c} | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) rename drivers/gpu/drm/i915/{display/intel_dpt.c => i915_dpt.c} (97%) diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index 7d726e8c21bf..1d71ecb3ca83 100644 --- 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 58d953472218..e229c5e26f5f 100644 --- 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; -- 2.47.3
