Commit 66824bd7 authored by Pierre Willenbrock's avatar Pierre Willenbrock Committed by Eric Anholt

drm/i915: Don't restore palettes through VGA registers.

The VGA registers just hit the pipe registers that we already set through
MMIO.  This fixes strange colors on resume.
Signed-off-by: default avatarPierre Willenbrock <pierre@pirsoft.de>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 0fce81e3
...@@ -279,7 +279,6 @@ typedef struct drm_i915_private { ...@@ -279,7 +279,6 @@ typedef struct drm_i915_private {
u8 saveAR_INDEX; u8 saveAR_INDEX;
u8 saveAR[21]; u8 saveAR[21];
u8 saveDACMASK; u8 saveDACMASK;
u8 saveDACDATA[256*3]; /* 256 3-byte colors */
u8 saveCR[37]; u8 saveCR[37];
struct { struct {
......
...@@ -119,11 +119,6 @@ static void i915_save_vga(struct drm_device *dev) ...@@ -119,11 +119,6 @@ static void i915_save_vga(struct drm_device *dev)
/* VGA color palette registers */ /* VGA color palette registers */
dev_priv->saveDACMASK = I915_READ8(VGA_DACMASK); dev_priv->saveDACMASK = I915_READ8(VGA_DACMASK);
/* DACCRX automatically increments during read */
I915_WRITE8(VGA_DACRX, 0);
/* Read 3 bytes of color data from each index */
for (i = 0; i < 256 * 3; i++)
dev_priv->saveDACDATA[i] = I915_READ8(VGA_DACDATA);
/* MSR bits */ /* MSR bits */
dev_priv->saveMSR = I915_READ8(VGA_MSR_READ); dev_priv->saveMSR = I915_READ8(VGA_MSR_READ);
...@@ -225,12 +220,6 @@ static void i915_restore_vga(struct drm_device *dev) ...@@ -225,12 +220,6 @@ static void i915_restore_vga(struct drm_device *dev)
/* VGA color palette registers */ /* VGA color palette registers */
I915_WRITE8(VGA_DACMASK, dev_priv->saveDACMASK); I915_WRITE8(VGA_DACMASK, dev_priv->saveDACMASK);
/* DACCRX automatically increments during read */
I915_WRITE8(VGA_DACWX, 0);
/* Read 3 bytes of color data from each index */
for (i = 0; i < 256 * 3; i++)
I915_WRITE8(VGA_DACDATA, dev_priv->saveDACDATA[i]);
} }
int i915_save_state(struct drm_device *dev) int i915_save_state(struct drm_device *dev)
......
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