Skip to contentSkip to conversation

drm/amd/powerplay: hint and error out when prerequisite not meet

PATCH In review Evan Quan 2 participants 2 messages Jan 3, 2019 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

Evan Quan

author
#0 lore raw

PATCH 1/1 drm/amd/powerplay: hint and error out when prerequisite not meet

Do not ignore the error silently. Otherwise user may thought it was executed successfully.

Change-Id I4ac0cff5918d53d1d737f1c2fb1a4f81917dbf56
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c        | 14 ++++++++++----
 drivers/gpu/drm/amd/powerplay/amd_powerplay.c |  4 +++-
 2 files changed, 13 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +10 -4
index 5e071917594f..e0a9f02d68d1 100644
@@ -756,8 +756,11 @@ static ssize_t amdgpu_set_pp_dpm_sclk(struct device *dev,
 	if (ret)
 		return ret;
 
-	if (adev->powerplay.pp_funcs->force_clock_level)
-		amdgpu_dpm_force_clock_level(adev, PP_SCLK, mask);
+	if (adev->powerplay.pp_funcs->force_clock_level) {
+		ret = amdgpu_dpm_force_clock_level(adev, PP_SCLK, mask);
+		if (ret)
+			return ret;
+	}
 
 	return count;
 }
@@ -789,8 +792,11 @@ static ssize_t amdgpu_set_pp_dpm_mclk(struct device *dev,
 	if (ret)
 		return ret;
 
-	if (adev->powerplay.pp_funcs->force_clock_level)
-		amdgpu_dpm_force_clock_level(adev, PP_MCLK, mask);
+	if (adev->powerplay.pp_funcs->force_clock_level) {
+		ret = amdgpu_dpm_force_clock_level(adev, PP_MCLK, mask);
+		if (ret)
+			return ret;
+	}
 
 	return count;
 }
drivers/gpu/drm/amd/powerplay/amd_powerplay.c +3 -1
index 27215e4b488b..285375b96ea4 100644
@@ -727,8 +727,10 @@ static int pp_dpm_force_clock_level(void *handle,
 	mutex_lock(&hwmgr->smu_lock);
 	if (hwmgr->dpm_level == AMD_DPM_FORCED_LEVEL_MANUAL)
 		ret = hwmgr->hwmgr_func->force_clock_level(hwmgr, type, mask);
-	else
+	else {
+		pr_info_ratelimited("Force clock level setting is for manual dpm mode only.\n");
 		ret = -EINVAL;
+	}
 	mutex_unlock(&hwmgr->smu_lock);
 	return ret;
 }
Signature · 6 lines
2.20.1

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

A message that is not in the archive (sent off-list or not yet received): [email protected]

Reviewed-by
#2 lore raw

________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Evan Quan <[email protected]>
Sent: Thursday, January 3, 2019 1:06:56 AM
To: [email protected]
Cc: Quan, Evan
Subject: [PATCH] drm/amd/powerplay: hint and error out when prerequisite not meet

Do not ignore the error silently. Otherwise user may thought it was executed successfully.

Change-Id I4ac0cff5918d53d1d737f1c2fb1a4f81917dbf56
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c        | 14 ++++++++++----
 drivers/gpu/drm/amd/powerplay/amd_powerplay.c |  4 +++-
 2 files changed, 13 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +10 -4
index 5e071917594f..e0a9f02d68d1 100644
@@ -756,8 +756,11 @@ static ssize_t amdgpu_set_pp_dpm_sclk(struct device *dev,
         if (ret)
                 return ret;
 
-       if (adev->powerplay.pp_funcs->force_clock_level)
-               amdgpu_dpm_force_clock_level(adev, PP_SCLK, mask);
+       if (adev->powerplay.pp_funcs->force_clock_level) {
+               ret = amdgpu_dpm_force_clock_level(adev, PP_SCLK, mask);
+               if (ret)
+                       return ret;
+       }
 
         return count;
 }
@@ -789,8 +792,11 @@ static ssize_t amdgpu_set_pp_dpm_mclk(struct device *dev,
         if (ret)
                 return ret;
 
-       if (adev->powerplay.pp_funcs->force_clock_level)
-               amdgpu_dpm_force_clock_level(adev, PP_MCLK, mask);
+       if (adev->powerplay.pp_funcs->force_clock_level) {
+               ret = amdgpu_dpm_force_clock_level(adev, PP_MCLK, mask);
+               if (ret)
+                       return ret;
+       }
 
         return count;
 }
drivers/gpu/drm/amd/powerplay/amd_powerplay.c +3 -1
index 27215e4b488b..285375b96ea4 100644
@@ -727,8 +727,10 @@ static int pp_dpm_force_clock_level(void *handle,
         mutex_lock(&hwmgr->smu_lock);
         if (hwmgr->dpm_level == AMD_DPM_FORCED_LEVEL_MANUAL)
                 ret = hwmgr->hwmgr_func->force_clock_level(hwmgr, type, mask);
-       else
+       else {
+               pr_info_ratelimited("Force clock level setting is for manual dpm mode only.\n");
                 ret = -EINVAL;
+       }
         mutex_unlock(&hwmgr->smu_lock);
         return ret;
 }

--
2.20.1

_______________________________________________
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