Skip to contentSkip to conversation

drm/amd/powerplay: Add SMU WMTABLE Validity Check for Renoir

PATCH In review Zhan Liu 2 participants 3 messages Dec 13, 2019 – Dec 16, 2019

Subsystems (2)
lore
Share & tools
lore

Zhan Liu

author
#0 lore raw

PATCH 1/1 drm/amd/powerplay: Add SMU WMTABLE Validity Check for Renoir

[Why]
SMU watermark table (WMTABLE) validity check is missing on Renoir. This validity check is very useful for checking whether WMTABLE is updated successfully.

[How]
Add SMU watermark validity check.

---
 drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +10 -2
index 89a54f8e08d3..81520b0fca68 100644
@@ -777,9 +777,17 @@ static int renoir_set_watermarks_table(
 	}
 
 	/* pass data to smu controller */
-	ret = smu_write_watermarks_table(smu);
+	if ((smu->watermarks_bitmap & WATERMARKS_EXIST) &&
+			!(smu->watermarks_bitmap & WATERMARKS_LOADED)) {
+		ret = smu_write_watermarks_table(smu);
+		if (ret) {
+			pr_err("Failed to update WMTABLE!");
+			return ret;
+		}
+		smu->watermarks_bitmap |= WATERMARKS_LOADED;
+	}
 
-	return ret;
+	return 0;
 }
 
 static int renoir_get_power_profile_mode(struct smu_context *smu,
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
author
#1 lore raw

Ping...

Quoted 49 lines

-----Original Message-----
From: Liu, Zhan <[email protected]>
Sent: 2019/December/13, Friday 11:50 AM
To: [email protected]; Wu, Hersen <[email protected]>; Deucher, Alexander <[email protected]>; Wang, Kevin(Yang) <[email protected]>; Quan, Evan <[email protected]>; Yin, Tianci (Rico) <[email protected]>
Cc: Liu, Zhan <[email protected]>
Subject: [PATCH] drm/amd/powerplay: Add SMU WMTABLE Validity Check for Renoir

[Why]
SMU watermark table (WMTABLE) validity check is missing on Renoir. This validity check is very useful for checking whether WMTABLE is updated successfully.

[How]
Add SMU watermark validity check.

---
 drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +10 -2
index 89a54f8e08d3..81520b0fca68 100644
@@ -777,9 +777,17 @@ static int renoir_set_watermarks_table(
 	}
 
 	/* pass data to smu controller */
-	ret = smu_write_watermarks_table(smu);
+	if ((smu->watermarks_bitmap & WATERMARKS_EXIST) &&
+			!(smu->watermarks_bitmap &
 WATERMARKS_LOADED)) {
+		ret = smu_write_watermarks_table(smu);
+		if (ret) {
+			pr_err("Failed to update WMTABLE!");
+			return ret;
+		}
+		smu->watermarks_bitmap |= WATERMARKS_LOADED;
+	}
 
-	return ret;
+	return 0;
 }
 
Quoted 3 lines

static int renoir_get_power_profile_mode(struct smu_context *smu,
--
2.17.1

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

Reviewed-by on v1 1/1
#2 lore raw
In reply to Zhan Liu

[AMD Official Use Only - Internal Distribution Only]

The patch looks good.

-----Original Message-----
From: Liu, Zhan <[email protected]>
Sent: Friday, December 13, 2019 11:50 AM
To: [email protected]; Wu, Hersen <[email protected]>; Deucher, Alexander <[email protected]>; Wang, Kevin(Yang) <[email protected]>; Quan, Evan <[email protected]>; Yin, Tianci (Rico) <[email protected]>
Cc: Liu, Zhan <[email protected]>
Subject: [PATCH] drm/amd/powerplay: Add SMU WMTABLE Validity Check for Renoir

[Why]
SMU watermark table (WMTABLE) validity check is missing on Renoir. This validity check is very useful for checking whether WMTABLE is updated successfully.

[How]
Add SMU watermark validity check.

---
 drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +10 -2
index 89a54f8e08d3..81520b0fca68 100644
@@ -777,9 +777,17 @@ static int renoir_set_watermarks_table(
 	}
 
 	/* pass data to smu controller */
-	ret = smu_write_watermarks_table(smu);
+	if ((smu->watermarks_bitmap & WATERMARKS_EXIST) &&
+			!(smu->watermarks_bitmap & WATERMARKS_LOADED)) {
+		ret = smu_write_watermarks_table(smu);
+		if (ret) {
+			pr_err("Failed to update WMTABLE!");
+			return ret;
+		}
+		smu->watermarks_bitmap |= WATERMARKS_LOADED;
+	}
 
-	return ret;
+	return 0;
 }
 
 static int renoir_get_power_profile_mode(struct smu_context *smu,

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