diff --git a/[refs] b/[refs] index 1e1abdeae8dc..134691422809 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c119e9c3b85cb61c1b2bfd616061662367e9240 +refs/heads/master: 7fc8878c3398a71c39e23ae1d9d56ba1f9e8c97d diff --git a/trunk/drivers/gpu/drm/radeon/r600_blit_shaders.c b/trunk/drivers/gpu/drm/radeon/r600_blit_shaders.c index a8f8bbcf760b..3bcbb938a0eb 100644 --- a/trunk/drivers/gpu/drm/radeon/r600_blit_shaders.c +++ b/trunk/drivers/gpu/drm/radeon/r600_blit_shaders.c @@ -458,10 +458,6 @@ const u32 r6xx_default_state[] = 0x00000000, 0x00000000, - 0xc0016900, - 0x00000206, /* PA_CL_VTE_CNTL */ - 0x00000000, - 0xc0016900, 0x00000207, 0x00000000, /* PA_CL_VS_OUT_CNTL */ @@ -477,10 +473,6 @@ const u32 r6xx_default_state[] = 0x3f800000, 0x3f800000, - 0xc0016900, - 0x00000205, - 0x00000004, /* PA_SU_SC_MODE_CNTL */ - 0xc0016900, 0x00000280, 0x00000000, /* PA_SU_POINT_SIZE */ @@ -1117,10 +1109,6 @@ const u32 r7xx_default_state[] = 0x00000000, 0x00000000, - 0xc0016900, - 0x00000206, - 0x00000000, /* PA_CL_VTE_CNTL */ - 0xc0016900, 0x00000207, 0x00000000, /* PA_CL_VS_OUT_CNTL */ @@ -1136,10 +1124,6 @@ const u32 r7xx_default_state[] = 0x3f800000, 0x3f800000, - 0xc0016900, - 0x00000205, - 0x00000004, /* PA_SU_SC_MODE_CNTL */ - 0xc0016900, 0x00000280, 0x00000000, /* PA_SU_POINT_SIZE */