aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/reg_srcs/r420
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2011-02-14 01:01:09 +0100
committerDave Airlie <airlied@redhat.com>2011-02-14 10:11:04 +1000
commit501834349e872ed4115eea3beef65ca9eeb5528e (patch)
tree3b6496d78fec262ad7f2622131553ef659ee6bf3 /drivers/gpu/drm/radeon/reg_srcs/r420
parentdrm/radeon/kms: use linear aligned for evergreen/ni bo blits (diff)
downloadlinux-dev-501834349e872ed4115eea3beef65ca9eeb5528e.tar.xz
linux-dev-501834349e872ed4115eea3beef65ca9eeb5528e.zip
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/reg_srcs/r420')
-rw-r--r--drivers/gpu/drm/radeon/reg_srcs/r4204
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/reg_srcs/r420 b/drivers/gpu/drm/radeon/reg_srcs/r420
index 8c1214c2390f..5c95cf87f7f2 100644
--- a/drivers/gpu/drm/radeon/reg_srcs/r420
+++ b/drivers/gpu/drm/radeon/reg_srcs/r420
@@ -130,7 +130,6 @@ r420 0x4f60
0x401C GB_SELECT
0x4020 GB_AA_CONFIG
0x4024 GB_FIFO_SIZE
-0x4028 GB_Z_PEQ_CONFIG
0x4100 TX_INVALTAGS
0x4200 GA_POINT_S0
0x4204 GA_POINT_T0
@@ -750,9 +749,7 @@ r420 0x4f60
0x4DF4 US_ALU_CONST_G_31
0x4DF8 US_ALU_CONST_B_31
0x4DFC US_ALU_CONST_A_31
-0x4E04 RB3D_BLENDCNTL_R3
0x4E08 RB3D_ABLENDCNTL_R3
-0x4E0C RB3D_COLOR_CHANNEL_MASK
0x4E10 RB3D_CONSTANT_COLOR
0x4E14 RB3D_COLOR_CLEAR_VALUE
0x4E18 RB3D_ROPCNTL_R3
@@ -782,4 +779,5 @@ r420 0x4f60
0x4F08 ZB_STENCILREFMASK
0x4F14 ZB_ZTOP
0x4F18 ZB_ZCACHE_CTLSTAT
+0x4F28 ZB_DEPTHCLEARVALUE
0x4F58 ZB_ZPASS_DATA