diff options
author | Marek Olšák <maraeo@gmail.com> | 2011-02-13 19:01:09 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-02-13 19:11:04 -0500 |
commit | 501834349e872ed4115eea3beef65ca9eeb5528e (patch) | |
tree | 3b6496d78fec262ad7f2622131553ef659ee6bf3 /drivers/gpu/drm/radeon/r300.c | |
parent | 27dcfc102279867ef0080d3b27e0f8306cac53d1 (diff) |
drm/radeon/kms: fix tracking of BLENDCNTL, COLOR_CHANNEL_MASK, and GB_Z on r300
Also move ZB_DEPTHCLEARVALUE to the list of safe regs.
Signed-off-by: Marek Olšák <maraeo@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r300.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r300.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c index 15f94648f274..862b61742b82 100644 --- a/drivers/gpu/drm/radeon/r300.c +++ b/drivers/gpu/drm/radeon/r300.c | |||
@@ -873,6 +873,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, | |||
873 | track->zb_dirty = true; | 873 | track->zb_dirty = true; |
874 | break; | 874 | break; |
875 | case 0x4104: | 875 | case 0x4104: |
876 | /* TX_ENABLE */ | ||
876 | for (i = 0; i < 16; i++) { | 877 | for (i = 0; i < 16; i++) { |
877 | bool enabled; | 878 | bool enabled; |
878 | 879 | ||
@@ -1103,8 +1104,6 @@ static int r300_packet0_check(struct radeon_cs_parser *p, | |||
1103 | track->blend_read_enable = !!(idx_value & (1 << 2)); | 1104 | track->blend_read_enable = !!(idx_value & (1 << 2)); |
1104 | track->cb_dirty = true; | 1105 | track->cb_dirty = true; |
1105 | break; | 1106 | break; |
1106 | case 0x4f28: /* ZB_DEPTHCLEARVALUE */ | ||
1107 | break; | ||
1108 | case 0x4f30: /* ZB_MASK_OFFSET */ | 1107 | case 0x4f30: /* ZB_MASK_OFFSET */ |
1109 | case 0x4f34: /* ZB_ZMASK_PITCH */ | 1108 | case 0x4f34: /* ZB_ZMASK_PITCH */ |
1110 | case 0x4f44: /* ZB_HIZ_OFFSET */ | 1109 | case 0x4f44: /* ZB_HIZ_OFFSET */ |