From 134edd1256e5ac24636f3b3a92f65745f0e71042 Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Sun, 26 Jul 2009 00:50:38 +0200 Subject: [PATCH] --- yaml --- r: 156535 b: refs/heads/master c: 819e0064634f580ab618189e657ea58341d214b7 h: refs/heads/master i: 156533: 9a0e74eb6472f2cca8130cb14159f9c0c2fcc6ab 156531: daa88c00ed3eb35743aa0ddda0f25f20216e2e67 156527: a0923eed9096dd6d22230fbd17930653e8534ba2 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_suspend.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 31246f2a9b76..4ac08e8f41ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9c9fe1f841745184bbc5460c6f3909fded3b929b +refs/heads/master: 819e0064634f580ab618189e657ea58341d214b7 diff --git a/trunk/drivers/gpu/drm/i915/i915_suspend.c b/trunk/drivers/gpu/drm/i915/i915_suspend.c index 9e1d16e5c3ea..1d04e1904ac6 100644 --- a/trunk/drivers/gpu/drm/i915/i915_suspend.c +++ b/trunk/drivers/gpu/drm/i915/i915_suspend.c @@ -598,7 +598,7 @@ int i915_restore_state(struct drm_device *dev) for (i = 0; i < 16; i++) { I915_WRITE(SWF00 + (i << 2), dev_priv->saveSWF0[i]); - I915_WRITE(SWF10 + (i << 2), dev_priv->saveSWF1[i+7]); + I915_WRITE(SWF10 + (i << 2), dev_priv->saveSWF1[i]); } for (i = 0; i < 3; i++) I915_WRITE(SWF30 + (i << 2), dev_priv->saveSWF2[i]);