summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorMichel Dänzer <daenzer@vmware.com>2009-09-15 17:09:26 +0200
committerDave Airlie <airlied@linux.ie>2009-09-16 09:14:58 +1000
commit95a8f1bf4f48b434c9f839ab5a0773f66b39d7c6 (patch)
tree063c0b3a5845b5a25b6136d7ad487e0966bdaf60 /drivers/gpu
parentfb1fbf8e098cd4cd2c1dece3dc8f15e7de82170a (diff)
downloadop-kernel-dev-95a8f1bf4f48b434c9f839ab5a0773f66b39d7c6.zip
op-kernel-dev-95a8f1bf4f48b434c9f839ab5a0773f66b39d7c6.tar.gz
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>
Diffstat (limited to 'drivers/gpu')
-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 7b6d0b1..cc8e005 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,
radeon_combios_asic_init(rdev->ddev);
}
}
+ /* Get vram informations */
+ radeon_vram_info(rdev);
/* Initialize clocks */
r = radeon_clocks_init(rdev);
if (r) {
return r;
}
- /* Get vram informations */
- radeon_vram_info(rdev);
/* Initialize memory controller (also test AGP) */
r = radeon_mc_init(rdev);
OpenPOWER on IntegriCloud