]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
drm/i915: merge soc/intel_gmch.[ch] to display/intel_vga.c
authorJani Nikula <jani.nikula@intel.com>
Wed, 19 Nov 2025 18:52:51 +0000 (20:52 +0200)
committerJani Nikula <jani.nikula@intel.com>
Fri, 21 Nov 2025 10:12:56 +0000 (12:12 +0200)
commitaa4dc3eeff6d5c47ed08905e5cf7b9b77a646fea
tree9d32235403e7353f1468615b0555033a588766e4
parentfff15f68eb06af4a77e349d419717bc9a2f4b37b
drm/i915: merge soc/intel_gmch.[ch] to display/intel_vga.c

The sole user of the remaining functions in intel_gmch.[ch] is in
intel_vga.c. Move everything there.

Since intel_gmch.c hasn't been part of xe, use a dummy function
relocated from xe_display_misc.c, with #ifdef. This is purely to keep
this change non-functional.

This allows us to remove soc/intel_gmch.[ch] from i915, compat
soc/intel_gmch.h from xe, and xe_display_misc.c from xe.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/b0f853ad7eae686738defa9e8f08a8848df8f226.1763578288.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/display/intel_vga.c
drivers/gpu/drm/i915/soc/intel_gmch.c [deleted file]
drivers/gpu/drm/i915/soc/intel_gmch.h [deleted file]
drivers/gpu/drm/xe/Makefile
drivers/gpu/drm/xe/compat-i915-headers/soc/intel_gmch.h [deleted file]
drivers/gpu/drm/xe/display/xe_display_misc.c [deleted file]