Skip to contentSkip to conversation

Revert "drm/i915: Include display_mmio_offset in sequencer index/data registers"

PATCH Applied [email protected] 2 participants 2 messages Jun 6, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "drm/i915: Include display_mmio_offset in sequencer index/data registers"

From: Ville Syrjälä <[email protected]>

We use port I/O for VGA register access, so adding display_mmio_offset is just wrong.

This reverts commit 56a12a509296c87d6f149be86c6694d312b21d35.

---
 drivers/gpu/drm/i915/i915_reg.h | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +2 -8
index 5a593d2..acb61a4 100644
@@ -147,15 +147,9 @@
 #define   VGA_MSR_MEM_EN (1<<1)
 #define   VGA_MSR_CGA_MODE (1<<0)
 
-/*
- * SR01 is the only VGA register touched on non-UMS setups.
- * VLV doesn't do UMS, so the sequencer index/data registers
- * are the only VGA registers which need to include
- * display_mmio_offset.
- */
-#define VGA_SR_INDEX (dev_priv->info->display_mmio_offset + 0x3c4)
+#define VGA_SR_INDEX 0x3c4
 #define SR01			1
-#define VGA_SR_DATA (dev_priv->info->display_mmio_offset + 0x3c5)
+#define VGA_SR_DATA 0x3c5
 
 #define VGA_AR_INDEX 0x3c0
 #define   VGA_AR_VID_EN (1<<5)
Signature · 6 lines
1.8.1.5

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw
Quoted 8 lines · On Thu, Jun 06, 2013 at 01:09:32PM +0300, [email protected] wrote:

From: Ville Syrjälä <[email protected]>

We use port I/O for VGA register access, so adding display_mmio_offset is just wrong.

This reverts commit 56a12a509296c87d6f149be86c6694d312b21d35.

Queued for -next, thanks for the patch. Since vlv is only considered useful in 3.11 no cc: stable for this.
-Daniel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch