drm/amd/pm: apply dummy reads workaround for CDR enabled only
authorEvan Quan <evan.quan@amd.com>
Fri, 18 Sep 2020 02:31:14 +0000 (10:31 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 18 Sep 2020 20:14:41 +0000 (16:14 -0400)
For CDR disabled case, the dummy reads workaround is not needed.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c

index a027c7f..846c9c9 100644 (file)
@@ -2303,10 +2303,12 @@ static int navi10_run_umc_cdr_workaround(struct smu_context *smu)
                if (umc_fw_greater_than_v136)
                        return 0;
 
-               if (umc_fw_disable_cdr && adev->asic_type == CHIP_NAVI10)
-                       return navi10_umc_hybrid_cdr_workaround(smu);
-               else
+               if (umc_fw_disable_cdr) {
+                       if (adev->asic_type == CHIP_NAVI10)
+                               return navi10_umc_hybrid_cdr_workaround(smu);
+               } else {
                        return navi10_set_dummy_pstates_table_location(smu);
+               }
        } else {
                if (adev->asic_type == CHIP_NAVI10)
                        return navi10_umc_hybrid_cdr_workaround(smu);