The DSB buffer implementation is different for both i915 and xe. Move the i915 specific implementation from display to i915 core.
Signed-off-by: Jani Nikula <[email protected]> --- drivers/gpu/drm/i915/Makefile | 2 +- .../drm/i915/{display/intel_dsb_buffer.c => i915_dsb_buffer.c} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename drivers/gpu/drm/i915/{display/intel_dsb_buffer.c => i915_dsb_buffer.c} (98%) diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index 241b1d2e2603..7d726e8c21bf 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_dsb_buffer.o \ i915_hdcp_gsc.o \ i915_initial_plane.o \ i915_panic.o @@ -274,7 +275,6 @@ i915-y += \ display/intel_dram.o \ display/intel_drrs.o \ display/intel_dsb.o \ - display/intel_dsb_buffer.o \ display/intel_fb.o \ display/intel_fb_bo.o \ display/intel_fb_pin.o \ diff --git a/drivers/gpu/drm/i915/display/intel_dsb_buffer.c b/drivers/gpu/drm/i915/i915_dsb_buffer.c similarity index 98% rename from drivers/gpu/drm/i915/display/intel_dsb_buffer.c rename to drivers/gpu/drm/i915/i915_dsb_buffer.c index 50faf3869b6c..de30d3896f4a 100644 --- a/drivers/gpu/drm/i915/display/intel_dsb_buffer.c +++ b/drivers/gpu/drm/i915/i915_dsb_buffer.c @@ -3,11 +3,11 @@ * Copyright 2023, Intel Corporation. */ +#include "display/intel_dsb_buffer.h" #include "gem/i915_gem_internal.h" #include "gem/i915_gem_lmem.h" #include "i915_drv.h" #include "i915_vma.h" -#include "intel_dsb_buffer.h" struct intel_dsb_buffer { u32 *cmd_buf; -- 2.47.3
