[Intel-xe] [v2 1/3] Revert "FIXME: drm/i915/vga: disable vga set decode for xe"

Uma Shankar uma.shankar at intel.com
Fri Oct 6 11:56:43 UTC 2023


This reverts commit 28da6179478e3f29cb27df30b71f68b904dfff26.

This will be addressed with an exclusive version for xe.

Reviewed-by: Arun R Murthy <arun.r.murthy at intel.com>
Signed-off-by: Uma Shankar <uma.shankar at intel.com>
---
 drivers/gpu/drm/i915/display/intel_vga.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_vga.c b/drivers/gpu/drm/i915/display/intel_vga.c
index 42da1a038042..286a0bdd28c6 100644
--- a/drivers/gpu/drm/i915/display/intel_vga.c
+++ b/drivers/gpu/drm/i915/display/intel_vga.c
@@ -102,7 +102,6 @@ void intel_vga_reset_io_mem(struct drm_i915_private *i915)
 static unsigned int
 intel_vga_set_decode(struct pci_dev *pdev, bool enable_decode)
 {
-#ifdef I915
 	struct drm_i915_private *i915 = pdev_to_i915(pdev);
 
 	intel_gmch_vga_set_state(i915, enable_decode);
@@ -112,9 +111,6 @@ intel_vga_set_decode(struct pci_dev *pdev, bool enable_decode)
 		       VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM;
 	else
 		return VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM;
-#else
-	return -EIO;
-#endif
 }
 
 int intel_vga_register(struct drm_i915_private *i915)
-- 
2.42.0



More information about the Intel-xe mailing list