Skip to contentSkip to conversation

drm/amdgpu/pm: add missing revision check for CI

PATCH In review Alex Deucher 3 participants 5 messages Apr 28 – Apr 30

Subsystems (3)
lore
Share & tools
lore

Alex Deucher

author maintainer
#0 lore raw

PATCH 1/3 drm/amdgpu/pm: add missing revision check for CI

The ci_populate_all_memory_levels() workaround only applies to revision 0 SKUs.

Fixes 9f4b35411cfe ("drm/amd/powerplay: add CI asics support to smumgr (v3)")
---
 drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c +3 -2
index 69d8b05ef2457..6e89a032e3dcf 100644
@@ -1333,8 +1333,9 @@ static int ci_populate_all_memory_levels(struct pp_hwmgr *hwmgr)
 
 	dev_id = adev->pdev->device;
 
-	if ((dpm_table->mclk_table.count >= 2)
-		&& ((dev_id == 0x67B0) ||  (dev_id == 0x67B1))) {
+	if ((dpm_table->mclk_table.count >= 2) &&
+	    ((dev_id == 0x67B0) ||  (dev_id == 0x67B1)) &&
+	    (adev->pdev->revision == 0)) {
 		smu_data->smc_state_table.MemoryLevel[1].MinVddci =
 				smu_data->smc_state_table.MemoryLevel[0].MinVddci;
 		smu_data->smc_state_table.MemoryLevel[1].MinMvdd =
Signature · 1 line
2.53.0
author maintainer
#1 lore raw

PATCH 2/3 drm/amdgpu/pm: align Hawaii mclk workaround with radeon

Align the hawaii mclk workaround with radeon and windows.

Fixes 9f4b35411cfe ("drm/amd/powerplay: add CI asics support to smumgr (v3)")
---
 drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c +4 -4
index 6e89a032e3dcf..aea3ad523cc03 100644
@@ -1336,10 +1336,10 @@ static int ci_populate_all_memory_levels(struct pp_hwmgr *hwmgr)
 	if ((dpm_table->mclk_table.count >= 2) &&
 	    ((dev_id == 0x67B0) ||  (dev_id == 0x67B1)) &&
 	    (adev->pdev->revision == 0)) {
-		smu_data->smc_state_table.MemoryLevel[1].MinVddci =
-				smu_data->smc_state_table.MemoryLevel[0].MinVddci;
-		smu_data->smc_state_table.MemoryLevel[1].MinMvdd =
-				smu_data->smc_state_table.MemoryLevel[0].MinMvdd;
+		smu_data->smc_state_table.MemoryLevel[1].MinVddc =
+				smu_data->smc_state_table.MemoryLevel[0].MinVddc;
+		smu_data->smc_state_table.MemoryLevel[1].MinVddcPhases =
+				smu_data->smc_state_table.MemoryLevel[0].MinVddcPhases;
 	}
 	smu_data->smc_state_table.MemoryLevel[0].ActivityLevel = 0x1F;
 	CONVERT_FROM_HOST_TO_SMC_US(smu_data->smc_state_table.MemoryLevel[0].ActivityLevel);
Signature · 1 line
2.53.0
Reviewed-by on v1 2/3
#2 lore raw

RE: [PATCH 2/3] drm/amdgpu/pm: align Hawaii mclk workaround with radeon

Public

Quoted 45 lines

-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Alex Deucher
Sent: Tuesday, April 28, 2026 10:56 AM
To: [email protected]; [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: [PATCH 2/3] drm/amdgpu/pm: align Hawaii mclk workaround with radeon

Align the hawaii mclk workaround with radeon and windows.

Fixes 9f4b35411cfe ("drm/amd/powerplay: add CI asics support to smumgr (v3)")
---
 drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c +2 -4
index 6e89a032e3dcf..aea3ad523cc03 100644
@@ -1336,10 +1336,10 @@ static int ci_populate_all_memory_levels(struct
 pp_hwmgr *hwmgr)
      if ((dpm_table->mclk_table.count >= 2) &&
          ((dev_id == 0x67B0) ||  (dev_id == 0x67B1)) &&
          (adev->pdev->revision == 0)) {
-             smu_data->smc_state_table.MemoryLevel[1].MinVddci =
-                             smu_data-
 >smc_state_table.MemoryLevel[0].MinVddci;
-             smu_data->smc_state_table.MemoryLevel[1].MinMvdd =
-                             smu_data-
 >smc_state_table.MemoryLevel[0].MinMvdd;
+             smu_data->smc_state_table.MemoryLevel[1].MinVddc =
+                             smu_data-
Quoted 1 line

smc_state_table.MemoryLevel[0].MinVddc;

drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c +2 -0
+             smu_data->smc_state_table.MemoryLevel[1].MinVddcPhases =
+                             smu_data-
Quoted 1 line

smc_state_table.MemoryLevel[0].MinVddcPhases;

      }
      smu_data->smc_state_table.MemoryLevel[0].ActivityLevel = 0x1F;
      CONVERT_FROM_HOST_TO_SMC_US(smu_data-
Quoted 1 line

smc_state_table.MemoryLevel[0].ActivityLevel);

--
2.53.0

author maintainer
#3 lore raw

PATCH 3/3 drm/radeon: add missing revision check for CI

In reply to Alex Deucher

The memory level workarounds only apply to revision 0 SKUs.

Fixes 127e056e2a82 ("drm/radeon: fix mclk vddc configuration for cards for hawaii")
Fixes 21b8a369046f ("drm/radeon: fix dram timing for certain hawaii boards")
Fixes 90b2fee35cb9 ("drm/radeon: fix dpm mc init for certain hawaii boards")
---
 drivers/gpu/drm/radeon/ci_dpm.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/radeon/ci_dpm.c +6 -3
index ba8db1d07c070..b47b91272b244 100644
@@ -2461,7 +2461,8 @@ static void ci_register_patching_mc_arb(struct radeon_device *rdev,
 
 	if (patch &&
 	    ((rdev->pdev->device == 0x67B0) ||
-	     (rdev->pdev->device == 0x67B1))) {
+	     (rdev->pdev->device == 0x67B1)) &&
+	    (rdev->pdev->revision == 0)) {
 		if ((memory_clock > 100000) && (memory_clock <= 125000)) {
 			tmp2 = (((0x31 * engine_clock) / 125000) - 1) & 0xff;
 			*dram_timimg2 &= ~0x00ff0000;
@@ -3304,7 +3305,8 @@ static int ci_populate_all_memory_levels(struct radeon_device *rdev)
 	pi->smc_state_table.MemoryLevel[0].EnabledForActivity = 1;
 
 	if ((dpm_table->mclk_table.count >= 2) &&
-	    ((rdev->pdev->device == 0x67B0) || (rdev->pdev->device == 0x67B1))) {
+	    ((rdev->pdev->device == 0x67B0) || (rdev->pdev->device == 0x67B1)) &&
+	    (rdev->pdev->revision == 0)) {
 		pi->smc_state_table.MemoryLevel[1].MinVddc =
 			pi->smc_state_table.MemoryLevel[0].MinVddc;
 		pi->smc_state_table.MemoryLevel[1].MinVddcPhases =
@@ -4493,7 +4495,8 @@ static int ci_register_patching_mc_seq(struct radeon_device *rdev,
 
 	if (patch &&
 	    ((rdev->pdev->device == 0x67B0) ||
-	     (rdev->pdev->device == 0x67B1))) {
+	     (rdev->pdev->device == 0x67B1)) &&
+	    (rdev->pdev->revision == 0)) {
 		for (i = 0; i < table->last; i++) {
 			if (table->last >= SMU7_DISCRETE_MC_REGISTER_ARRAY_SIZE)
 				return -EINVAL;
Signature · 1 line
2.53.0
Reviewed-by on v1 1/3
#4 lore raw
In reply to Alex Deucher
Quoted 7 lines · On 2026. április 28., kedd 16:56:18 közép-európai nyári idő Alex Deucher wrote:

The ci_populate_all_memory_levels() workaround only applies to revision 0 SKUs.

Fixes 9f4b35411cfe ("drm/amd/powerplay: add CI asics support to smumgr

(v3)") Reviewed-by: Kent Russell <[email protected]>

Thank you Alex!

for all 3 patches in this series

Quoted 23 lines
---
 drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c index 69d8b05ef2457..6e89a032e3dcf 100644

drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c +3 -2
@@ -1333,8 +1333,9 @@ static int ci_populate_all_memory_levels(struct
 pp_hwmgr *hwmgr)
 
 	dev_id = adev->pdev->device;
 
-	if ((dpm_table->mclk_table.count >= 2)
-		&& ((dev_id == 0x67B0) ||  (dev_id == 0x67B1))) {
+	if ((dpm_table->mclk_table.count >= 2) &&
+	    ((dev_id == 0x67B0) ||  (dev_id == 0x67B1)) &&
+	    (adev->pdev->revision == 0)) {
 		smu_data->smc_state_table.MemoryLevel[1].MinVddci =
 				smu_data-

smc_state_table.MemoryLevel[0].MinVddci;
smu_data->smc_state_table.MemoryLevel[1].MinMvdd =