diff options
-rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_device.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/rv770.c | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index af430d719e7f..1e1cab5ef1e4 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c | |||
@@ -1537,6 +1537,7 @@ int r600_init(struct radeon_device *rdev) | |||
1537 | r600_scratch_init(rdev); | 1537 | r600_scratch_init(rdev); |
1538 | /* Initialize surface registers */ | 1538 | /* Initialize surface registers */ |
1539 | radeon_surface_init(rdev); | 1539 | radeon_surface_init(rdev); |
1540 | radeon_get_clock_info(rdev->ddev); | ||
1540 | r = radeon_clocks_init(rdev); | 1541 | r = radeon_clocks_init(rdev); |
1541 | if (r) | 1542 | if (r) |
1542 | return r; | 1543 | return r; |
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 0b5014c2ae7f..8a40c616b534 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c | |||
@@ -386,7 +386,6 @@ int radeon_clocks_init(struct radeon_device *rdev) | |||
386 | { | 386 | { |
387 | int r; | 387 | int r; |
388 | 388 | ||
389 | radeon_get_clock_info(rdev->ddev); | ||
390 | r = radeon_static_clocks_init(rdev->ddev); | 389 | r = radeon_static_clocks_init(rdev->ddev); |
391 | if (r) { | 390 | if (r) { |
392 | return r; | 391 | return r; |
@@ -617,7 +616,8 @@ int radeon_device_init(struct radeon_device *rdev, | |||
617 | radeon_combios_asic_init(rdev->ddev); | 616 | radeon_combios_asic_init(rdev->ddev); |
618 | } | 617 | } |
619 | } | 618 | } |
620 | /* Get vram informations */ | 619 | /* Get clock & vram information */ |
620 | radeon_get_clock_info(rdev->ddev); | ||
621 | radeon_vram_info(rdev); | 621 | radeon_vram_info(rdev); |
622 | /* Initialize clocks */ | 622 | /* Initialize clocks */ |
623 | r = radeon_clocks_init(rdev); | 623 | r = radeon_clocks_init(rdev); |
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index be2f86539ebc..8bab6b4f05d1 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c | |||
@@ -917,6 +917,7 @@ int rv770_init(struct radeon_device *rdev) | |||
917 | r600_scratch_init(rdev); | 917 | r600_scratch_init(rdev); |
918 | /* Initialize surface registers */ | 918 | /* Initialize surface registers */ |
919 | radeon_surface_init(rdev); | 919 | radeon_surface_init(rdev); |
920 | radeon_get_clock_info(rdev->ddev); | ||
920 | r = radeon_clocks_init(rdev); | 921 | r = radeon_clocks_init(rdev); |
921 | if (r) | 922 | if (r) |
922 | return r; | 923 | return r; |