Skip to contentSkip to conversation

drm/amd/pm: decouple the watermark table setting from socclk/uclk dpms

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

Subsystems (3)
lore
Share & tools
lore

Evan Quan

author
#0 lore raw

PATCH 1/2 drm/amd/pm: decouple the watermark table setting from socclk/uclk dpms

As they have no real dependence. And for Navi1x, the socclk/uclk dpms are enabled after DAL initialization.

Change-Id Ia66a92155aadff40e4e2e46edbedce840cfb57ca
---
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +7 -8
index 2b529885b05b..002bae81b856 100644
@@ -1831,17 +1831,16 @@ int smu_set_watermarks_for_clock_ranges(struct smu_context *smu,
 	if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)
 		return -EOPNOTSUPP;
 
+	if (smu->disable_watermark)
+		return 0;
+
 	mutex_lock(&smu->mutex);
 
-	if (!smu->disable_watermark &&
-			smu_feature_is_enabled(smu, SMU_FEATURE_DPM_DCEFCLK_BIT) &&
-			smu_feature_is_enabled(smu, SMU_FEATURE_DPM_SOCCLK_BIT)) {
-		ret = smu_set_watermarks_table(smu, clock_ranges);
+	ret = smu_set_watermarks_table(smu, clock_ranges);
 
-		if (!(smu->watermarks_bitmap & WATERMARKS_EXIST)) {
-			smu->watermarks_bitmap |= WATERMARKS_EXIST;
-			smu->watermarks_bitmap &= ~WATERMARKS_LOADED;
-		}
+	if (!(smu->watermarks_bitmap & WATERMARKS_EXIST)) {
+		smu->watermarks_bitmap |= WATERMARKS_EXIST;
+		smu->watermarks_bitmap &= ~WATERMARKS_LOADED;
 	}
 
 	mutex_unlock(&smu->mutex);
Signature · 6 lines
2.28.0

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

PATCH 2/2 drm/amd/pm: drop redundant watermarks bitmap setting

As this is already set inside the implementation of smu_set_watermarks_table().

Change-Id I4d4d40855f0aad43f6d21d471b64f1c7e696f0e7
---
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0 -5
index 002bae81b856..ef10be599d37 100644
@@ -1838,11 +1838,6 @@ int smu_set_watermarks_for_clock_ranges(struct smu_context *smu,
 
 	ret = smu_set_watermarks_table(smu, clock_ranges);
 
-	if (!(smu->watermarks_bitmap & WATERMARKS_EXIST)) {
-		smu->watermarks_bitmap |= WATERMARKS_EXIST;
-		smu->watermarks_bitmap &= ~WATERMARKS_LOADED;
-	}
-
 	mutex_unlock(&smu->mutex);
 
 	return ret;
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 2/2
#2 lore raw

Re: [PATCH 2/2] drm/amd/pm: drop redundant watermarks bitmap setting

[AMD Public Use]

Series is:

________________________________
From: Quan, Evan <[email protected]>
Sent: Sunday, September 20, 2020 10:49 PM
To: [email protected] <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Quan, Evan <[email protected]>
Subject: [PATCH 2/2] drm/amd/pm: drop redundant watermarks bitmap setting

As this is already set inside the implementation of smu_set_watermarks_table().

Change-Id I4d4d40855f0aad43f6d21d471b64f1c7e696f0e7
---
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0 -5
index 002bae81b856..ef10be599d37 100644
@@ -1838,11 +1838,6 @@ int smu_set_watermarks_for_clock_ranges(struct smu_context *smu,
 
         ret = smu_set_watermarks_table(smu, clock_ranges);
 
-       if (!(smu->watermarks_bitmap & WATERMARKS_EXIST)) {
-               smu->watermarks_bitmap |= WATERMARKS_EXIST;
-               smu->watermarks_bitmap &= ~WATERMARKS_LOADED;
-       }
-
         mutex_unlock(&smu->mutex);
 
         return ret;

--
2.28.0

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