Skip to contentSkip to conversation

drm/amd/pm: correct the pmfw version check for Navi14

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

Subsystems (3)
lore
Share & tools
lore

Evan Quan

author
#0 lore raw

PATCH 1/1 drm/amd/pm: correct the pmfw version check for Navi14

Otherwise, that will be always true for Navi14.

Change-Id Ief94150d10e4987e405d97674d9ae4efe89246fb
---
 drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +4 -3
index e729337e84d0..b9e522ed499a 100644
@@ -2279,13 +2279,14 @@ static int navi10_run_umc_cdr_workaround(struct smu_context *smu)
 	}
 
 	/*
-	 * The messages below are only supported by 42.53.0 and later
-	 * PMFWs.
+	 * The messages below are only supported by Navi10 42.53.0 and later
+	 * PMFWs and Navi14 53.29.0 and later PMFWs.
 	 * - PPSMC_MSG_SetDriverDummyTableDramAddrHigh
 	 * - PPSMC_MSG_SetDriverDummyTableDramAddrLow
 	 * - PPSMC_MSG_GetUMCFWWA
 	 */
-	if (pmfw_version >= 0x2a3500) {
+	if (((adev->asic_type == CHIP_NAVI10) && (pmfw_version >= 0x2a3500)) ||
+	    ((adev->asic_type == CHIP_NAVI14) && (pmfw_version >= 0x351D00))) {
 		ret = smu_cmn_send_smc_msg_with_param(smu,
 						      SMU_MSG_GET_UMC_FW_WA,
 						      0,
Signature · 6 lines
2.28.0

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

[AMD Public Use]

________________________________
From: Quan, Evan <[email protected]>
Sent: Sunday, September 20, 2020 10:47 PM
To: [email protected] <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Quan, Evan <[email protected]>
Subject: [PATCH] drm/amd/pm: correct the pmfw version check for Navi14

Otherwise, that will be always true for Navi14.

Change-Id Ief94150d10e4987e405d97674d9ae4efe89246fb
---
 drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +4 -3
index e729337e84d0..b9e522ed499a 100644
@@ -2279,13 +2279,14 @@ static int navi10_run_umc_cdr_workaround(struct smu_context *smu)
         }
 
         /*
-        * The messages below are only supported by 42.53.0 and later
-        * PMFWs.
+        * The messages below are only supported by Navi10 42.53.0 and later
+        * PMFWs and Navi14 53.29.0 and later PMFWs.
          * - PPSMC_MSG_SetDriverDummyTableDramAddrHigh
          * - PPSMC_MSG_SetDriverDummyTableDramAddrLow
          * - PPSMC_MSG_GetUMCFWWA
          */
-       if (pmfw_version >= 0x2a3500) {
+       if (((adev->asic_type == CHIP_NAVI10) && (pmfw_version >= 0x2a3500)) ||
+           ((adev->asic_type == CHIP_NAVI14) && (pmfw_version >= 0x351D00))) {
                 ret = smu_cmn_send_smc_msg_with_param(smu,
                                                       SMU_MSG_GET_UMC_FW_WA,
                                                       0,

--
2.28.0

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