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>

diff --git a/drivers/gpu/drm/radeon/r600_blit_shaders.c b/drivers/gpu/drm/radeon/r600_blit_shaders.c
index 3a775c1..9a0553c 100644 (file)
--- 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,