Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+4
-19
+2
-2
drivers/gpu/drm/i915/Makefile
+2
-2
drivers/gpu/drm/i915/Makefile
···
58
58
59
59
# core peripheral code
60
60
i915-y += \
61
-
soc/intel_gmch.o \
62
-
soc/intel_rom.o
61
+
soc/intel_gmch.o
63
62
64
63
# core library code
65
64
i915-y += \
···
302
303
display/intel_pmdemand.o \
303
304
display/intel_psr.o \
304
305
display/intel_quirks.o \
306
+
display/intel_rom.o \
305
307
display/intel_sbi.o \
306
308
display/intel_sprite.o \
307
309
display/intel_sprite_uapi.o \
+1
-2
drivers/gpu/drm/i915/display/intel_bios.c
+1
-2
drivers/gpu/drm/i915/display/intel_bios.c
···
34
34
#include <drm/drm_fixed.h>
35
35
#include <drm/drm_print.h>
36
36
37
-
#include "soc/intel_rom.h"
38
-
39
37
#include "intel_display.h"
40
38
#include "intel_display_core.h"
41
39
#include "intel_display_rpm.h"
42
40
#include "intel_display_types.h"
43
41
#include "intel_display_utils.h"
44
42
#include "intel_gmbus.h"
43
+
#include "intel_rom.h"
45
44
46
45
#define _INTEL_BIOS_PRIVATE
47
46
#include "intel_vbt_defs.h"
drivers/gpu/drm/i915/soc/intel_rom.c
drivers/gpu/drm/i915/display/intel_rom.c
drivers/gpu/drm/i915/soc/intel_rom.c
drivers/gpu/drm/i915/display/intel_rom.c
drivers/gpu/drm/i915/soc/intel_rom.h
drivers/gpu/drm/i915/display/intel_rom.h
drivers/gpu/drm/i915/soc/intel_rom.h
drivers/gpu/drm/i915/display/intel_rom.h
+1
-9
drivers/gpu/drm/xe/Makefile
+1
-9
drivers/gpu/drm/xe/Makefile
···
191
191
-I$(srctree)/drivers/gpu/drm/i915/display/ \
192
192
-Ddrm_i915_private=xe_device
193
193
194
-
# Rule to build SOC code shared with i915
195
-
$(obj)/i915-soc/%.o: $(srctree)/drivers/gpu/drm/i915/soc/%.c FORCE
196
-
$(call cmd,force_checksrc)
197
-
$(call if_changed_rule,cc_o_c)
198
-
199
194
# Rule to build display code shared with i915
200
195
$(obj)/i915-display/%.o: $(srctree)/drivers/gpu/drm/i915/display/%.c FORCE
201
196
$(call cmd,force_checksrc)
···
212
217
display/xe_plane_initial.o \
213
218
display/xe_stolen.o \
214
219
display/xe_tdf.o
215
-
216
-
# SOC code shared with i915
217
-
xe-$(CONFIG_DRM_XE_DISPLAY) += \
218
-
i915-soc/intel_rom.o
219
220
220
221
# Display code shared with i915
221
222
xe-$(CONFIG_DRM_XE_DISPLAY) += \
···
299
308
i915-display/intel_psr.o \
300
309
i915-display/intel_qp_tables.o \
301
310
i915-display/intel_quirks.o \
311
+
i915-display/intel_rom.o \
302
312
i915-display/intel_snps_hdmi_pll.o \
303
313
i915-display/intel_snps_phy.o \
304
314
i915-display/intel_tc.o \