Commit 56a12a50 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter

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

SR01 needs to be touched to disable VGA on non-UMS setups too.
So the sequencer registers need to include the appripriate offset
on VLV.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 67cfc203
...@@ -141,9 +141,15 @@ ...@@ -141,9 +141,15 @@
#define VGA_MSR_MEM_EN (1<<1) #define VGA_MSR_MEM_EN (1<<1)
#define VGA_MSR_CGA_MODE (1<<0) #define VGA_MSR_CGA_MODE (1<<0)
#define VGA_SR_INDEX 0x3c4 /*
* 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 SR01 1 #define SR01 1
#define VGA_SR_DATA 0x3c5 #define VGA_SR_DATA (dev_priv->info->display_mmio_offset + 0x3c5)
#define VGA_AR_INDEX 0x3c0 #define VGA_AR_INDEX 0x3c0
#define VGA_AR_VID_EN (1<<5) #define VGA_AR_VID_EN (1<<5)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment