diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-02-26 15:42:41 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-02-26 15:42:41 +0000 |
| commit | 1e66322633943bc27bf5e68609f564fa95e6e6a1 (patch) | |
| tree | 1a536a41c6d9818484c0a972d565fb4914943729 /linux-core | |
| parent | 73cb02b5430b3881cbce5fb4852ac573c11ff831 (diff) | |
| parent | e87cec19687089f9f268ec0eb81b57e6fb8de6a9 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Conflicts:
shared-core/i915_dma.c
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/i915_drv.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c index 0123d412..6c12f1a1 100644 --- a/linux-core/i915_drv.c +++ b/linux-core/i915_drv.c @@ -248,6 +248,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 */ |