From: Jani Nikula Date: Tue, 20 Jan 2026 15:45:40 +0000 (+0200) Subject: drm/i915/dsb: move i915 specific DSB buffer implementation to i915 X-Git-Tag: v7.1-rc1~167^2~24^2~217 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1617f5955c6458513787656afde819c91323ab03;p=thirdparty%2Flinux.git drm/i915/dsb: move i915 specific DSB buffer implementation to i915 The DSB buffer implementation is different for both i915 and xe. Move the i915 specific implementation from display to i915 core. Reviewed-by: Michał Grzelak Link: https://patch.msgid.link/a01b3e69a3f79713eacf437af00dbe23d2f9c8dd.1768923917.git.jani.nikula@intel.com Signed-off-by: Jani Nikula --- diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index fad3cf0e9ab21..70af79cecf8f5 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 @@ -275,7 +276,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 50faf3869b6c0..de30d3896f4ad 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;