diff options
author | Dave Airlie <airlied@redhat.com> | 2009-08-26 21:10:15 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-08-26 21:11:56 -0400 |
commit | 3f7dc91adef90a20f806282724c40d68d5b020aa (patch) | |
tree | 3deb339fd9c3cba79c293dc4aad2f1ecd2f0821f /drivers/gpu/drm/radeon/rs600.c | |
parent | 52f97df5da1f94d2b7db1bb53a2f053ae162b649 (diff) |
drm/rs600/690: use autogenerated safe register tables.
This ports rs690 to the safe reg tables and makes rs600 also
use the same table.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/rs600.c')
-rw-r--r-- | drivers/gpu/drm/radeon/rs600.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c index 7e8ce983a90..1b8d62f5e73 100644 --- a/drivers/gpu/drm/radeon/rs600.c +++ b/drivers/gpu/drm/radeon/rs600.c | |||
@@ -29,6 +29,8 @@ | |||
29 | #include "radeon_reg.h" | 29 | #include "radeon_reg.h" |
30 | #include "radeon.h" | 30 | #include "radeon.h" |
31 | 31 | ||
32 | #include "rs600_reg_safe.h" | ||
33 | |||
32 | /* rs600 depends on : */ | 34 | /* rs600 depends on : */ |
33 | void r100_hdp_reset(struct radeon_device *rdev); | 35 | void r100_hdp_reset(struct radeon_device *rdev); |
34 | int r100_gui_wait_for_idle(struct radeon_device *rdev); | 36 | int r100_gui_wait_for_idle(struct radeon_device *rdev); |
@@ -409,3 +411,10 @@ void rs600_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v) | |||
409 | ((reg) & RS600_MC_ADDR_MASK)); | 411 | ((reg) & RS600_MC_ADDR_MASK)); |
410 | WREG32(RS600_MC_DATA, v); | 412 | WREG32(RS600_MC_DATA, v); |
411 | } | 413 | } |
414 | |||
415 | int rs600_init(struct radeon_device *rdev) | ||
416 | { | ||
417 | rdev->config.r300.reg_safe_bm = rs600_reg_safe_bm; | ||
418 | rdev->config.r300.reg_safe_bm_size = ARRAY_SIZE(rs600_reg_safe_bm); | ||
419 | return 0; | ||
420 | } | ||