Commit 39273b58 authored by Jesse Barnes's avatar Jesse Barnes Committed by Linus Torvalds
Browse files

i915: fix AR register restore.

Make sure the restoration correctly restores the AR registers by
flipping the ARX register into index mode before doing anything.

Without this, some people have had the text mode restore all green.
Signed-off-by: default avatarJesse Barnes <>
Signed-off-by: default avatarLinus Torvalds <>
parent 2f93d797
...@@ -222,6 +222,7 @@ static void i915_restore_vga(struct drm_device *dev) ...@@ -222,6 +222,7 @@ static void i915_restore_vga(struct drm_device *dev)
dev_priv->saveGR[0x18]); dev_priv->saveGR[0x18]);
/* Attribute controller registers */ /* Attribute controller registers */
for (i = 0; i < 20; i++) for (i = 0; i < 20; i++)
i915_write_ar(st01, i, dev_priv->saveAR[i], 0); i915_write_ar(st01, i, dev_priv->saveAR[i], 0);
inb(st01); /* switch back to index mode */ inb(st01); /* switch back to index mode */
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