summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/radeon/reg_srcs/r600
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2012-08-24 14:27:36 +0200
committerAlex Deucher <alexander.deucher@amd.com>2012-08-29 12:11:00 -0400
commit523885dec109188b6bed53ec67362072f13b0d43 (patch)
treeef576ed797b11fa4f7c2c9232071d7210cc22fd9 /drivers/gpu/drm/radeon/reg_srcs/r600
parent3b5ef597ec40603c368f65d3eb6d9818ed6a7bae (diff)
drm/radeon: add proper checking of RESOLVE_BOX command for r600-r700
Checking of the second colorbuffer was skipped on r700, because CB_TARGET_MASK was 0xf. With r600, CB_TARGET_MASK is changed to 0xff, so we must set the number of samples of the second colorbuffer to 1 in order to pass the CS checker. The DRM version is bumped, because RESOLVE_BOX is always rejected without this fix on r600. Signed-off-by: Marek Olšák <maraeo@gmail.com> Reviewed-by: Jerome Glisse <jglisse@redhat.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/reg_srcs/r600')
-rw-r--r--drivers/gpu/drm/radeon/reg_srcs/r6001
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/reg_srcs/r600 b/drivers/gpu/drm/radeon/reg_srcs/r600
index f93e45d869f4..20bfbda7b3f1 100644
--- a/drivers/gpu/drm/radeon/reg_srcs/r600
+++ b/drivers/gpu/drm/radeon/reg_srcs/r600
@@ -744,7 +744,6 @@ r600 0x9400
0x00028C38 CB_CLRCMP_DST
0x00028C3C CB_CLRCMP_MSK
0x00028C34 CB_CLRCMP_SRC
-0x00028808 CB_COLOR_CONTROL
0x0002842C CB_FOG_BLUE
0x00028428 CB_FOG_GREEN
0x00028424 CB_FOG_RED