summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorJesse Barnes <jesse.barnes@intel.com>2008-02-22 13:57:38 -0800
committerJesse Barnes <jesse.barnes@intel.com>2008-02-22 13:57:38 -0800
commit20d0e539160fcbdd65ecbe188ac1ce2800af1b5c (patch)
tree31605b459bcbc835711c192095c8e2e098878348 /linux-core
parent0d32015974f019e8d2ea1eb48acd9e082389d9c5 (diff)
i915: put ARX back into index mode before doing restore
Fixes resume from hibernate in some configurations.
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/i915_drv.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index cfcb62ed..e18bc8d0 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -247,6 +247,7 @@ static void i915_restore_vga(struct drm_device *dev)
dev_priv->saveGR[0x18]);
/* Attribute controller registers */
+ inb(st01); /* switch back to index mode */
for (i = 0; i < 20; i++)
i915_write_ar(st01, i, dev_priv->saveAR[i], 0);
inb(st01); /* switch back to index mode */