summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/radeon/reg_srcs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-08 06:09:17 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-08 06:09:17 +0400
commit12871a0bd67dd4db4418e1daafcd46e9d329ef10 (patch)
treefaf782dd816040d6cdaaccd7113956d8d29cd0e5 /drivers/gpu/drm/radeon/reg_srcs
parentecff4fcc7bbaf060646d2160123f8dc02605a047 (diff)
parentf3aeceac61b6e2f3167717ea1793472108e47564 (diff)
downloadlinux-12871a0bd67dd4db4418e1daafcd46e9d329ef10.tar.xz
Merge branch 'drm-radeon-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-radeon-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon/kms/atom: fix PHY init drm/radeon/kms: add missing Evergreen texture formats to the CS parser drm/radeon/kms: viewport height has to be even drm/radeon/kms: remove duplicate reg from r600 safe regs drm/radeon/kms: add support for Llano Fusion APUs drm/radeon/kms: add llano pci ids drm/radeon/kms: fill in asic struct for llano drm/radeon/kms: add family ids for llano APUs drm/radeon: fix oops in ttm reserve when pageflipping (v2) drm/radeon/kms: clean up the radeon kms Kconfig drm/radeon/kms: fix thermal sensor reading on juniper drm/radeon/kms: add missing case for cayman thermal sensor drm/radeon/kms: add blit support for cayman (v2) drm/radeon/kms/blit: workaround some hw issues on evergreen+
Diffstat (limited to 'drivers/gpu/drm/radeon/reg_srcs')
-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 92f1900dc7ca..ea49752ee99c 100644
--- a/drivers/gpu/drm/radeon/reg_srcs/r600
+++ b/drivers/gpu/drm/radeon/reg_srcs/r600
@@ -758,6 +758,5 @@ r600 0x9400
0x00009714 VC_ENHANCE
0x00009830 DB_DEBUG
0x00009838 DB_WATERMARKS
-0x00028D28 DB_SRESULTS_COMPARE_STATE0
0x00028D44 DB_ALPHA_TO_MASK
0x00009700 VC_CNTL