diff options
author | Marek Olšák <maraeo@gmail.com> | 2012-03-07 23:33:00 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-12 12:31:40 -0700 |
commit | b5718645fe623bca4e87d3a0f5c6148d3dc19a00 (patch) | |
tree | 8a68d209aec0a10a2bcf1f8523fe81d20a5cc939 | |
parent | 2cfb4e5c22726c099645a7e5fc447d4ffcfca85c (diff) | |
download | kernel-common-b5718645fe623bca4e87d3a0f5c6148d3dc19a00.tar.gz kernel-common-b5718645fe623bca4e87d3a0f5c6148d3dc19a00.tar.bz2 kernel-common-b5718645fe623bca4e87d3a0f5c6148d3dc19a00.zip |
drm/radeon/kms: set SX_MISC in the r6xx blit code (v2)
commit cf00790dea6f210ddd01a6656da58c7c9a4ea0e4 upstream.
Mesa may set it to 1, causing all primitives to be killed.
v2: also update the r7xx code
Signed-off-by: Marek Olšák <maraeo@gmail.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/gpu/drm/radeon/r600_blit_shaders.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/r600_blit_shaders.c b/drivers/gpu/drm/radeon/r600_blit_shaders.c index 2d1f6c5ee2a7..73e2c7c6edbc 100644 --- a/drivers/gpu/drm/radeon/r600_blit_shaders.c +++ b/drivers/gpu/drm/radeon/r600_blit_shaders.c @@ -314,6 +314,10 @@ const u32 r6xx_default_state[] = 0x00000000, /* VGT_VTX_CNT_EN */ 0xc0016900, + 0x000000d4, + 0x00000000, /* SX_MISC */ + + 0xc0016900, 0x000002c8, 0x00000000, /* VGT_STRMOUT_BUFFER_EN */ @@ -626,6 +630,10 @@ const u32 r7xx_default_state[] = 0x00000000, /* VGT_VTX_CNT_EN */ 0xc0016900, + 0x000000d4, + 0x00000000, /* SX_MISC */ + + 0xc0016900, 0x000002c8, 0x00000000, /* VGT_STRMOUT_BUFFER_EN */ |