drm/amd/powerplay: move bootup value before read pptable from vbios

In navi10, we need read the pp_table_id from bootup value, then decide whether
use load the soft pptable.

Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
index a3a6099ab8cdf07fe5aeece6406e5fd44f9de443..88fd79d5aca654619b32123a3f2ad5c9d683c693 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
@@ -628,12 +628,12 @@ static int smu_smc_table_hw_init(struct smu_context *smu,
                return ret;
 
        if (initialize) {
-               ret = smu_read_pptable_from_vbios(smu);
+               /* get boot_values from vbios to set revision, gfxclk, and etc. */
+               ret = smu_get_vbios_bootup_values(smu);
                if (ret)
                        return ret;
 
-               /* get boot_values from vbios to set revision, gfxclk, and etc. */
-               ret = smu_get_vbios_bootup_values(smu);
+               ret = smu_read_pptable_from_vbios(smu);
                if (ret)
                        return ret;