Skip to contentSkip to conversation

drm/amd/pm: apply dummy reads workaround for CDR enabled only

PATCH In review Evan Quan 2 participants 2 messages Sep 18, 2020

Subsystems (3)
lore
Share & tools
lore

Evan Quan

author
#0 lore raw

PATCH 1/1 drm/amd/pm: apply dummy reads workaround for CDR enabled only

For CDR disabled case, the dummy reads workaround is not needed.

Change-Id I474619b3d82792151870811c289ab311028de211
---
 drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +5 -3
index 338a9fdeef6e..5b87690c1e61 100644
@@ -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);
Signature · 6 lines
2.28.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
maintainer Acked-by on v1 1/1
#1 lore raw

[AMD Official Use Only - Internal Distribution Only]

________________________________
From: Quan, Evan <[email protected]>
Sent: Thursday, September 17, 2020 10:36 PM
To: [email protected] <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Quan, Evan <[email protected]>
Subject: [PATCH] drm/amd/pm: apply dummy reads workaround for CDR enabled only

For CDR disabled case, the dummy reads workaround is not needed.

Change-Id I474619b3d82792151870811c289ab311028de211
---
 drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +5 -3
index 338a9fdeef6e..5b87690c1e61 100644
@@ -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);

--
2.28.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx