Skip to contentSkip to conversation

drm/amd/powerplay: Copy watermark to SMU

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

Subsystems (2)
lore
Share & tools
lore

Zhan Liu

author
#0 lore raw

PATCH v3 1/1 drm/amd/powerplay: Copy watermark to SMU

[Why]
Watermark value was expected to copy to SMU
within navi10_display_config_changed(). But
navi10_display_config_changed() is never called.
As a result, the watermark value is never
copied to SMU.

[How]
At end of navi10_set_watermarks_table,
copy watermark to SMU.

---
 drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +11 -0
index 15403b7979d6..f4cdd78492fa 100644
@@ -1472,6 +1472,17 @@ static int navi10_set_watermarks_table(struct smu_context *smu,
 				clock_ranges->wm_mcif_clocks_ranges[i].wm_set_id;
 	}
 
+	/* Pass data to smu controller */
+	if ((smu->watermarks_bitmap & WATERMARKS_EXIST) &&
+			!(smu->watermarks_bitmap & WATERMARKS_LOADED)) {
+		int ret = smu_write_watermarks_table(smu);
+		if (ret) {
+			pr_err("Failed to update WMTABLE!");
+			return ret;
+		}
+		smu->watermarks_bitmap |= WATERMARKS_LOADED;
+	}
+
 	return 0;
 }
 
Signature · 7 lines
2.17.1

Fix a typo here.
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Acked-by on v3 1/1
#1 lore raw
Quoted 8 lines · Zhan Liu

[Why]
Watermark value was expected to copy to SMU
within navi10_display_config_changed(). But
navi10_display_config_changed() is never called.
As a result, the watermark value is never
copied to SMU.

Quoted 5 lines

[How]
At end of navi10_set_watermarks_table,
copy watermark to SMU.

This and the renoir patch are:

Do we know why this isn't getting setup in the display configuration callback? Are the watermarks static or do the depend on something?

Alex

Quoted 29 lines
---
 drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +11 -1
index 15403b7979d6..f4cdd78492fa 100644
@@ -1472,6 +1472,17 @@ static int navi10_set_watermarks_table(struct smu_context *smu,
                                clock_ranges->wm_mcif_clocks_ranges[i].wm_set_id;
        }
 
+       /* Pass data to smu controller */
+       if ((smu->watermarks_bitmap & WATERMARKS_EXIST) &&
+                       !(smu->watermarks_bitmap & WATERMARKS_LOADED)) {
+               int ret = smu_write_watermarks_table(smu);
+               if (ret) {
+                       pr_err("Failed to update WMTABLE!");
+                       return ret;
+               }
+               smu->watermarks_bitmap |= WATERMARKS_LOADED;
+       }
+
        return 0;
 }
 
--

2.17.1

Quoted 5 lines

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

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