---

yaml --- r: 179329 b: refs/heads/master c: 21bd770 h: refs/heads/master i: 179327: a979254 v: v3
git-mirror · Jan 15, 2010 · b3e36c5 · b3e36c5
1 parent a7ccef7
commit b3e36c5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6036ae7e9486352d5d1cbbee89186986e28e11fd
+refs/heads/master: 21bd770b9c90ee6a53a9dbb6293513a8c7654cfe
diff --git a/trunk/drivers/gpu/drm/i915/i915_reg.h b/trunk/drivers/gpu/drm/i915/i915_reg.h
@@ -1815,7 +1815,7 @@
 #define   DSPFW_PLANEB_SHIFT	8
 #define DSPFW2			0x70038
 #define   DSPFW_CURSORA_MASK	0x00003f00
-#define   DSPFW_CURSORA_SHIFT	16
+#define   DSPFW_CURSORA_SHIFT	8
 #define DSPFW3			0x7003c
 #define   DSPFW_HPLL_SR_EN	(1<<31)
 #define   DSPFW_CURSOR_SR_SHIFT	24