summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2010-07-26 13:47:54 -0400
committerDave Airlie <airlied@redhat.com>2010-08-02 10:07:09 +1000
commit363c6a16e30464fddcb8f82b7e8f44109729cc95 (patch)
tree3d8535b41e30cdae33a4b26bdc8b678c6c6b03c4
parenteb544433c368ad95615af168bfb2fedfc5e9ddb1 (diff)
downloadlinux-3.10-363c6a16e30464fddcb8f82b7e8f44109729cc95.tar.gz
linux-3.10-363c6a16e30464fddcb8f82b7e8f44109729cc95.tar.bz2
linux-3.10-363c6a16e30464fddcb8f82b7e8f44109729cc95.zip
drm/radeon: r6xx/r7xx move vport clipping to a single packet
Saves lots of dwords in blit emit Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/radeon/r600_blit_shaders.c310
1 files changed, 62 insertions, 248 deletions
diff --git a/drivers/gpu/drm/radeon/r600_blit_shaders.c b/drivers/gpu/drm/radeon/r600_blit_shaders.c
index 3a775c198af..9a0553c69f1 100644
--- a/drivers/gpu/drm/radeon/r600_blit_shaders.c
+++ b/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,