---

yaml --- r: 205031 b: refs/heads/master c: 363c6a1 h: refs/heads/master i: 205029: 72737a7 205027: 6b8ded7 205023: e0383df v: v3
git-mirror · Aug 2, 2010 · 68c600f · 68c600f
1 parent 33e49d3
commit 68c600f
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 249 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb544433c368ad95615af168bfb2fedfc5e9ddb1
+refs/heads/master: 363c6a16e30464fddcb8f82b7e8f44109729cc95
diff --git a/trunk/drivers/gpu/drm/radeon/r600_blit_shaders.c b/trunk/drivers/gpu/drm/radeon/r600_blit_shaders.c
@@ -167,163 +167,70 @@ const u32 r6xx_default_state[] =
 	0x20002000,
 	0x00000000, /* PA_SC_EDGERULE */
 
-	0xc0026900,
+	0xc0406900,
 	0x00000094,
 	0x80000000, /* PA_SC_VPORT_SCISSOR_0_TL */
 	0x20002000, /* PA_SC_VPORT_SCISSOR_0_BR */
-
-	0xc0026900,
-	0x000000b4,
-	0x00000000, /* PA_SC_VPORT_ZMIN_0 */
-	0x3f800000,
-
-	0xc0026900,
-	0x00000096,
 	0x80000000, /* PA_SC_VPORT_SCISSOR_1_TL */
 	0x20002000,
-
-	0xc0026900,
-	0x000000b6,
-	0x00000000,
-	0x3f800000,
-
-	0xc0026900,
-	0x00000098,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000b8,
-	0x00000000,
-	0x3f800000,
-
-	0xc0026900,
-	0x0000009a,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000ba,
-	0x00000000,
-	0x3f800000,
-
-	0xc0026900,
-	0x0000009c,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000bc,
-	0x00000000,
-	0x3f800000,
-
-	0xc0026900,
-	0x0000009e,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000be,
-	0x00000000,
-	0x3f800000,
-
-	0xc0026900,
-	0x000000a0,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000c0,
-	0x00000000,
-	0x3f800000,
-
-	0xc0026900,
-	0x000000a2,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000c2,
-	0x00000000,
-	0x3f800000,
-
-	0xc0026900,
-	0x000000a4,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000c4,
-	0x00000000,
-	0x3f800000,
-
-	0xc0026900,
-	0x000000a6,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000c6,
-	0x00000000,
-	0x3f800000,
-
-	0xc0026900,
-	0x000000a8,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000c8,
-	0x00000000,
-	0x3f800000,
-
-	0xc0026900,
-	0x000000aa,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000ca,
-	0x00000000,
-	0x3f800000,
-
-	0xc0026900,
-	0x000000ac,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000cc,
-	0x00000000,
-	0x3f800000,
-
-	0xc0026900,
-	0x000000ae,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000ce,
-	0x00000000,
-	0x3f800000,
-
-	0xc0026900,
-	0x000000b0,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000d0,
-	0x00000000,
-	0x3f800000,
-
-	0xc0026900,
-	0x000000b2,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000d2,
+	0x00000000, /* PA_SC_VPORT_ZMIN_0 */
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
 	0x00000000,
 	0x3f800000,
 
@@ -665,163 +572,70 @@ const u32 r7xx_default_state[] =
 	0x20002000,
 	0xaaaaaaaa, /* PA_SC_EDGERULE */
 
-	0xc0026900,
+	0xc0406900,
 	0x00000094,
 	0x80000000, /* PA_SC_VPORT_SCISSOR_0_TL */
 	0x20002000, /* PA_SC_VPORT_SCISSOR_0_BR */
-
-	0xc0026900,
-	0x000000b4,
-	0x00000000, /* PA_SC_VPORT_ZMIN_0 */
-	0x3f800000,
-
-	0xc0026900,
-	0x00000096,
+	0x80000000, /* PA_SC_VPORT_SCISSOR_1_TL */
+	0x20002000,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000b6,
-	0x00000000,
-	0x3f800000,
-
-	0xc0026900,
-	0x00000098,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000b8,
-	0x00000000,
-	0x3f800000,
-
-	0xc0016900,
-	0x0000009a,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000ba,
-	0x00000000,
-	0x3f800000,
-
-	0xc0026900,
-	0x0000009c,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000bc,
-	0x00000000,
-	0x3f800000,
-
-	0xc0026900,
-	0x0000009e,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000be,
-	0x00000000,
-	0x3f800000,
-
-	0xc0026900,
-	0x000000a0,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000c0,
-	0x00000000,
-	0x3f800000,
-
-	0xc0026900,
-	0x000000a2,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000c2,
-	0x00000000,
-	0x3f800000,
-
-	0xc0026900,
-	0x000000a4,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000c4,
-	0x00000000,
-	0x3f800000,
-
-	0xc0026900,
-	0x000000a6,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000c6,
-	0x00000000,
-	0x3f800000,
-
-	0xc0026900,
-	0x000000a8,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000c8,
-	0x00000000,
-	0x3f800000,
-
-	0xc0026900,
-	0x000000aa,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000ca,
-	0x00000000,
-	0x3f800000,
-
-	0xc0026900,
-	0x000000ac,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000cc,
-	0x00000000,
-	0x3f800000,
-
-	0xc0026900,
-	0x000000ae,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000ce,
-	0x00000000,
-	0x3f800000,
-
-	0xc0026900,
-	0x000000b0,
 	0x80000000,
 	0x20002000,
-
-	0xc0026900,
-	0x000000d0,
+	0x00000000, /* PA_SC_VPORT_ZMIN_0 */
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
+	0x00000000,
+	0x3f800000,
 	0x00000000,
 	0x3f800000,
-
-	0xc0026900,
-	0x000000b2,
-	0x80000000,
-	0x20002000,
-
-	0xc0026900,
-	0x000000d2,
 	0x00000000,
 	0x3f800000,