From: Shirish S <shirish.s@amd.com>
Date: Fri, 19 Mar 2021 06:58:40 +0000 (+0530)
Subject: drm/amdgpu/powerplay/smu10: refactor AMDGPU_PP_SENSOR_GPU_LOAD
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=85a44ecd34e35bc4dd3e23279e827b2b0360c36d;p=linux.git

drm/amdgpu/powerplay/smu10: refactor AMDGPU_PP_SENSOR_GPU_LOAD

refactor AMDGPU_PP_SENSOR_GPU_LOAD to ensure code consistency with other
commands

Signed-off-by: Shirish S <shirish.s@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

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 f5d59fa3a0308..f5fe540cd5366 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,
 						   &activity_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;