From: Michel Dänzer Date: Tue, 15 Sep 2009 15:09:26 +0000 (+0200) Subject: drm/radeon/kms: Move radeon_clocks_init() call back after getting VRAM info. X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=95a8f1bf4f48b434c9f839ab5a0773f66b39d7c6;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git 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 Signed-off-by: Dave Airlie --- 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, 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);