drm/radeon/kms: Move radeon_clocks_init() call back after getting VRAM info.
authorMichel Dänzer <daenzer@vmware.com>
Tue, 15 Sep 2009 15:09:26 +0000 (17:09 +0200)
committerDave Airlie <airlied@linux.ie>
Tue, 15 Sep 2009 23:14:58 +0000 (09:14 +1000)
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>
drivers/gpu/drm/radeon/radeon_device.c

index 7b6d0b1a59628b2b56b43a5f6bc7d7ebbe135571..cc8e005c1b3081ffc554dfa58da340c4cb309203 100644 (file)
@@ -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);