aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/rs600.c
diff options
context:
space:
mode:
authorJerome Glisse <jglisse@redhat.com>2009-10-01 03:39:24 -0400
committerDave Airlie <airlied@redhat.com>2009-10-01 18:51:50 -0400
commit3bc6853593bd4fba357dc252b3cf60cd86a1d2ec (patch)
treef60509478804b0087bef653dc6c10578deeb40e9 /drivers/gpu/drm/radeon/rs600.c
parentd4550907157d8b3d5286157c15f1200c44842269 (diff)
drm/radeon/kms: Convert RS690/RS740 to new init path (V2).
Also cleanup register specific to RS690/RS740. Version 2 add missing header file for register, remove unecessary call to AGP function and fix an indentation bug. Signed-off-by: Jerome Glisse <jglisse@redhat.com> 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.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
index 4a4fe1cb131c..fa8e451c64e8 100644
--- a/drivers/gpu/drm/radeon/rs600.c
+++ b/drivers/gpu/drm/radeon/rs600.c
@@ -416,9 +416,14 @@ void rs600_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v)
416 WREG32(RS600_MC_DATA, v); 416 WREG32(RS600_MC_DATA, v);
417} 417}
418 418
419int rs600_init(struct radeon_device *rdev) 419void rs600_set_safe_registers(struct radeon_device *rdev)
420{ 420{
421 rdev->config.r300.reg_safe_bm = rs600_reg_safe_bm; 421 rdev->config.r300.reg_safe_bm = rs600_reg_safe_bm;
422 rdev->config.r300.reg_safe_bm_size = ARRAY_SIZE(rs600_reg_safe_bm); 422 rdev->config.r300.reg_safe_bm_size = ARRAY_SIZE(rs600_reg_safe_bm);
423}
424
425int rs600_init(struct radeon_device *rdev)
426{
427 rs600_set_safe_registers(rdev);
423 return 0; 428 return 0;
424} 429}