aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Dänzer <daenzer@vmware.com>2009-09-15 11:09:26 -0400
committerDave Airlie <airlied@linux.ie>2009-09-15 19:14:58 -0400
commit95a8f1bf4f48b434c9f839ab5a0773f66b39d7c6 (patch)
tree063c0b3a5845b5a25b6136d7ad487e0966bdaf60
parentfb1fbf8e098cd4cd2c1dece3dc8f15e7de82170a (diff)
drm/radeon/kms: Move radeon_clocks_init() call back after getting VRAM info.
It may indirectly call radeon_set_clock_gating() which relies on the VRAM info. Signed-off-by: Michel Dänzer <daenzer@vmware.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
-rw-r--r--drivers/gpu/drm/radeon/radeon_device.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 7b6d0b1a5962..cc8e005c1b30 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -616,13 +616,13 @@ int radeon_device_init(struct radeon_device *rdev,
616 radeon_combios_asic_init(rdev->ddev); 616 radeon_combios_asic_init(rdev->ddev);
617 } 617 }
618 } 618 }
619 /* Get vram informations */
620 radeon_vram_info(rdev);
619 /* Initialize clocks */ 621 /* Initialize clocks */
620 r = radeon_clocks_init(rdev); 622 r = radeon_clocks_init(rdev);
621 if (r) { 623 if (r) {
622 return r; 624 return r;
623 } 625 }
624 /* Get vram informations */
625 radeon_vram_info(rdev);
626 626
627 /* Initialize memory controller (also test AGP) */ 627 /* Initialize memory controller (also test AGP) */
628 r = radeon_mc_init(rdev); 628 r = radeon_mc_init(rdev);