Re: [PATCH] drm/amdgpu/powerplay/smu10: refactor AMDGPU_PP_SENSOR_GPU_LOAD

2021-03-19 Thread Alex Deucher
On Fri, Mar 19, 2021 at 3:04 AM Shirish S  wrote:
>
> refactor AMDGPU_PP_SENSOR_GPU_LOAD to ensure code consistency with other
> commands
>
> Signed-off-by: Shirish S 

Reviewed-by: Alex Deucher 

> ---
>  .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c| 13 ++---
>  1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c 
> b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c
> index f5d59fa3a030..f5fe540cd536 100644
> --- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c
> +++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c
> @@ -1297,19 +1297,18 @@ static int smu10_read_sensor(struct pp_hwmgr *hwmgr, 
> int idx,
> *size = 4;
> break;
> case AMDGPU_PP_SENSOR_GPU_LOAD:
> -   if (has_gfx_busy) {
> +   if (!has_gfx_busy)
> +   ret = -EOPNOTSUPP;
> +   else {
> ret = smum_send_msg_to_smc(hwmgr,
>PPSMC_MSG_GetGfxBusy,
>_percent);
> if (!ret)
> -   activity_percent = activity_percent > 100 ? 
> 100 : activity_percent;
> +   *((uint32_t *)value) = min(activity_percent, 
> (u32)100);
> else
> -   return -EIO;
> -   *((uint32_t *)value) = activity_percent;
> -   return 0;
> -   } else {
> -   return -EOPNOTSUPP;
> +   ret = -EIO;
> }
> +   break;
> default:
> ret = -EOPNOTSUPP;
> break;
> --
> 2.17.1
>
> ___
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx


[PATCH] drm/amdgpu/powerplay/smu10: refactor AMDGPU_PP_SENSOR_GPU_LOAD

2021-03-19 Thread Shirish S
refactor AMDGPU_PP_SENSOR_GPU_LOAD to ensure code consistency with other
commands

Signed-off-by: Shirish S 
---
 .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c| 13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c 
b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c
index f5d59fa3a030..f5fe540cd536 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c
@@ -1297,19 +1297,18 @@ static int smu10_read_sensor(struct pp_hwmgr *hwmgr, 
int idx,
*size = 4;
break;
case AMDGPU_PP_SENSOR_GPU_LOAD:
-   if (has_gfx_busy) {
+   if (!has_gfx_busy)
+   ret = -EOPNOTSUPP;
+   else {
ret = smum_send_msg_to_smc(hwmgr,
   PPSMC_MSG_GetGfxBusy,
   _percent);
if (!ret)
-   activity_percent = activity_percent > 100 ? 100 
: activity_percent;
+   *((uint32_t *)value) = min(activity_percent, 
(u32)100);
else
-   return -EIO;
-   *((uint32_t *)value) = activity_percent;
-   return 0;
-   } else {
-   return -EOPNOTSUPP;
+   ret = -EIO;
}
+   break;
default:
ret = -EOPNOTSUPP;
break;
-- 
2.17.1

___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx