CVS commit: [netbsd-5-1] src/sys/external/bsd/drm/dist/shared-core

[Manuel Bouyer]

Module Name:    src
Committed By:   bouyer
Date:           Sun Jan 13 16:32:31 UTC 2013

Modified Files:
        src/sys/external/bsd/drm/dist/shared-core [netbsd-5-1]: i915_suspend.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1831):
        sys/external/bsd/drm/dist/shared-core/i915_suspend.c: revision 1.6
Fix wrong reference to dev_priv->saveSWF1. It was clearly wrong.


To generate a diff of this commit:
cvs rdiff -u -r1.3.10.1 -r1.3.10.1.2.1 \
    src/sys/external/bsd/drm/dist/shared-core/i915_suspend.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/external/bsd/drm/dist/shared-core/i915_suspend.c
diff -u src/sys/external/bsd/drm/dist/shared-core/i915_suspend.c:1.3.10.1 src/sys/external/bsd/drm/dist/shared-core/i915_suspend.c:1.3.10.1.2.1
--- src/sys/external/bsd/drm/dist/shared-core/i915_suspend.c:1.3.10.1	Sat Jun 20 23:37:01 2009
+++ src/sys/external/bsd/drm/dist/shared-core/i915_suspend.c	Sun Jan 13 16:32:30 2013
@@ -512,7 +512,7 @@ int i915_restore_state(struct drm_device
 
 	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]);