From: Jani Nikula Date: Wed, 19 Nov 2025 18:52:52 +0000 (+0200) Subject: drm/xe/vga: use the same intel_gmch_vga_set_decode() as i915 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8c02fddc9cf7d778a7a838660a679d6d68b0608;p=thirdparty%2Fkernel%2Flinux.git drm/xe/vga: use the same intel_gmch_vga_set_decode() as i915 Drop the #ifdef I915, and use the same intel_gmch_vga_set_decode() for both i915 and xe. Reviewed-by: Ville Syrjälä Link: https://patch.msgid.link/f4121e6c70bac6c26ef3cf51aaf72822f2cb2d54.1763578288.git.jani.nikula@intel.com Signed-off-by: Jani Nikula --- diff --git a/drivers/gpu/drm/i915/display/intel_vga.c b/drivers/gpu/drm/i915/display/intel_vga.c index 5e516c79e2f79..c45c4bbc3f957 100644 --- a/drivers/gpu/drm/i915/display/intel_vga.c +++ b/drivers/gpu/drm/i915/display/intel_vga.c @@ -95,7 +95,6 @@ void intel_vga_reset_io_mem(struct intel_display *display) vga_put(pdev, VGA_RSRC_LEGACY_IO); } -#ifdef I915 static int intel_gmch_vga_set_state(struct intel_display *display, bool enable_decode) { struct pci_dev *pdev = to_pci_dev(display->drm->dev); @@ -135,13 +134,6 @@ static unsigned int intel_gmch_vga_set_decode(struct pci_dev *pdev, bool enable_ else return VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM; } -#else -static unsigned int intel_gmch_vga_set_decode(struct pci_dev *pdev, bool enable_decode) -{ - /* ToDo: Implement the actual handling of vga decode */ - return 0; -} -#endif int intel_vga_register(struct intel_display *display) {