From: Alex Deucher <alexander.deucher@amd.com>
Date: Mon, 30 Nov 2020 22:53:43 +0000 (-0500)
Subject: drm/amdgpu/swsmu/vangogh: return error if fetching metrics fails
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b4339bb9a4f807f0acfbcc89e7abe77f431058c8;p=linux.git

drm/amdgpu/swsmu/vangogh: return error if fetching metrics fails

rather than just dropping the error.  Also fixes a set but not
used variable warning.

Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
index 1c1af7483dfe3..86a1410631fb3 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
@@ -410,6 +410,8 @@ static int vangogh_get_current_activity_percent(struct smu_context *smu,
 		ret = vangogh_get_smu_metrics_data(smu,
 						  METRICS_AVERAGE_GFXACTIVITY,
 						  value);
+		if (ret)
+			return ret;
 		break;
 	default:
 		dev_err(smu->adev->dev, "Invalid sensor for retrieving clock activity\n");