The bo interface 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 +- drivers/gpu/drm/i915/{display/intel_bo.c => i915_bo.c} | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) rename drivers/gpu/drm/i915/{display/intel_bo.c => i915_bo.c} (97%) diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index 7e9d9b666511..52a82608b8b1 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@ -76,6 +76,7 @@ i915-$(CONFIG_PERF_EVENTS) += \ # core display adaptation i915-y += \ + i915_bo.o \ i915_display_pc8.o \ i915_dpt.o \ i915_dsb_buffer.o \ @@ -239,7 +240,6 @@ i915-y += \ display/intel_atomic.o \ display/intel_audio.o \ display/intel_bios.o \ - display/intel_bo.o \ display/intel_bw.o \ display/intel_casf.o \ display/intel_cdclk.o \ diff --git a/drivers/gpu/drm/i915/display/intel_bo.c b/drivers/gpu/drm/i915/i915_bo.c similarity index 97% rename from drivers/gpu/drm/i915/display/intel_bo.c rename to drivers/gpu/drm/i915/i915_bo.c index 2b6eaec351d8..21a4533ba341 100644 --- a/drivers/gpu/drm/i915/display/intel_bo.c +++ b/drivers/gpu/drm/i915/i915_bo.c @@ -3,12 +3,13 @@ #include <drm/drm_panic.h> +#include "display/intel_bo.h" + #include "gem/i915_gem_mman.h" #include "gem/i915_gem_object.h" #include "gem/i915_gem_object_frontbuffer.h" #include "pxp/intel_pxp.h" #include "i915_debugfs.h" -#include "intel_bo.h" bool intel_bo_is_tiled(struct drm_gem_object *obj) { -- 2.47.3
