drm/i915: move intel_rom.[ch] from soc/ to display/

The sole user of intel_rom.[ch] has always been in display. Move them
under display.

This allows us to remove the compat soc/intel_rom.h from xe, as well as
the Makefile rules to build anything from soc/.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/352ec255a6e9b81c7d1e35d8fbf7018d4049d4d3.1763578288.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 57d150765784f3981a94a552a26cf8628254a99c..42f2d9294142cce1807333ab1bb04c4b8a54950c 100644 (file)
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -58,8 +58,7 @@ i915-y += \
 
 # core peripheral code
 i915-y += \
-       soc/intel_gmch.o \
-       soc/intel_rom.o
+       soc/intel_gmch.o
 
 # core library code
 i915-y += \
@@ -303,6 +302,7 @@ i915-y += \
        display/intel_pmdemand.o \
        display/intel_psr.o \
        display/intel_quirks.o \
+       display/intel_rom.o \
        display/intel_sbi.o \
        display/intel_sprite.o \
        display/intel_sprite_uapi.o \

diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 4b41068e9e35f2d5acb7991536c51ca7b6024b7d..a639c5eb324591099d6b08bc01869786a19beb2f 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -34,14 +34,13 @@
 #include <drm/drm_fixed.h>
 #include <drm/drm_print.h>
 
-#include "soc/intel_rom.h"
-
 #include "intel_display.h"
 #include "intel_display_core.h"
 #include "intel_display_rpm.h"
 #include "intel_display_types.h"
 #include "intel_display_utils.h"
 #include "intel_gmbus.h"
+#include "intel_rom.h"
 
 #define _INTEL_BIOS_PRIVATE
 #include "intel_vbt_defs.h"

diff --git a/drivers/gpu/drm/i915/soc/intel_rom.c b/drivers/gpu/drm/i915/display/intel_rom.c
similarity index 100%
rename from drivers/gpu/drm/i915/soc/intel_rom.c
rename to drivers/gpu/drm/i915/display/intel_rom.c

diff --git a/drivers/gpu/drm/i915/soc/intel_rom.h b/drivers/gpu/drm/i915/display/intel_rom.h
similarity index 100%
rename from drivers/gpu/drm/i915/soc/intel_rom.h
rename to drivers/gpu/drm/i915/display/intel_rom.h

diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
index f296a00e4dc9953ee16e769fa8c3dc26428b8bd0..f4315b0148268ebbf1e95079d4180970190783c9 100644 (file)
--- a/drivers/gpu/drm/xe/Makefile
+++ b/drivers/gpu/drm/xe/Makefile
@@ -191,11 +191,6 @@ subdir-ccflags-$(CONFIG_DRM_XE_DISPLAY) += \
        -I$(srctree)/drivers/gpu/drm/i915/display/ \
        -Ddrm_i915_private=xe_device
 
-# Rule to build SOC code shared with i915
-$(obj)/i915-soc/%.o: $(srctree)/drivers/gpu/drm/i915/soc/%.c FORCE
-       $(call cmd,force_checksrc)
-       $(call if_changed_rule,cc_o_c)
-
 # Rule to build display code shared with i915
 $(obj)/i915-display/%.o: $(srctree)/drivers/gpu/drm/i915/display/%.c FORCE
        $(call cmd,force_checksrc)
@@ -218,10 +213,6 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
        display/xe_stolen.o \
        display/xe_tdf.o
 
-# SOC code shared with i915
-xe-$(CONFIG_DRM_XE_DISPLAY) += \
-       i915-soc/intel_rom.o
-
 # Display code shared with i915
 xe-$(CONFIG_DRM_XE_DISPLAY) += \
        i915-display/icl_dsi.o \
@@ -308,6 +299,7 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
        i915-display/intel_psr.o \
        i915-display/intel_qp_tables.o \
        i915-display/intel_quirks.o \
+       i915-display/intel_rom.o \
        i915-display/intel_snps_hdmi_pll.o \
        i915-display/intel_snps_phy.o \
        i915-display/intel_tc.o \

diff --git a/drivers/gpu/drm/xe/compat-i915-headers/soc/intel_rom.h b/drivers/gpu/drm/xe/compat-i915-headers/soc/intel_rom.h
deleted file mode 100644 (file)
index 05cbfb6..0000000
--- a/drivers/gpu/drm/xe/compat-i915-headers/soc/intel_rom.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* SPDX-License-Identifier: MIT */
-/*
- * Copyright © 2024 Intel Corporation
- */
-
-#include "../../../i915/soc/intel_rom.h"