From: Alex Deucher <alexdeucher@gmail.com>
Date: Tue, 27 Jul 2010 15:11:19 +0000 (-0400)
Subject: drm/radeon: remove duplicate state emit in r6xx/r7xx blit
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7fc8878c3398a71c39e23ae1d9d56ba1f9e8c97d;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

drm/radeon: remove duplicate state emit in r6xx/r7xx blit

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 a8f8bbcf760..3bcbb938a0e 100644
--- a/drivers/gpu/drm/radeon/r600_blit_shaders.c
+++ b/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 */