From: Uma Shankar <uma.shankar@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: jani.nikula@intel.com, arun.r.murthy@intel.com
Subject: [Intel-xe] [v2 1/3] Revert "FIXME: drm/i915/vga: disable vga set decode for xe"
Date: Fri, 6 Oct 2023 17:26:43 +0530 [thread overview]
Message-ID: <20231006115645.2402795-2-uma.shankar@intel.com> (raw)
In-Reply-To: <20231006115645.2402795-1-uma.shankar@intel.com>
This reverts commit 28da6179478e3f29cb27df30b71f68b904dfff26.
This will be addressed with an exclusive version for xe.
Reviewed-by: Arun R Murthy <arun.r.murthy@intel.com>
Signed-off-by: Uma Shankar <uma.shankar@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
next prev parent reply other threads:[~2023-10-06 11:49 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-06 11:56 [Intel-xe] [v2 0/3] drm/xe: Cleanup for addressing vga decode Uma Shankar
2023-10-06 11:56 ` Uma Shankar [this message]
2023-10-06 11:56 ` [Intel-xe] [v2 2/3] drm/i915/display: Created exclusive version of vga decode setup Uma Shankar
2023-10-06 11:56 ` [Intel-xe] [v2 3/3] drm/xe: Create a dummy version for vga decode Uma Shankar
2023-10-09 4:27 ` Murthy, Arun R
2023-10-10 7:31 ` Shankar, Uma
2023-10-10 9:14 ` Jani Nikula
2023-10-10 9:31 ` Shankar, Uma
2023-10-06 14:59 ` [Intel-xe] ✓ CI.Patch_applied: success for drm/xe: Cleanup for addressing vga decode (rev2) Patchwork
2023-10-06 14:59 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-10-06 15:01 ` [Intel-xe] ✓ CI.KUnit: success " Patchwork
2023-10-06 15:08 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-10-06 15:08 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-10-06 15:10 ` [Intel-xe] ✗ CI.checksparse: warning " Patchwork
2023-10-06 15:46 ` [Intel-xe] ✓ CI.BAT: success " Patchwork
2023-10-12 3:39 ` [Intel-xe] [v2 0/3] drm/xe: Cleanup for addressing vga decode Shankar, Uma
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231006115645.2402795-2-uma.shankar@intel.com \
--to=uma.shankar@intel.com \
--cc=arun.r.murthy@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox