Acked-by: Slava Abramov <[email protected]>

________________________________
From: amd-gfx <[email protected]> on behalf of Colin King 
<[email protected]>
Sent: Friday, June 28, 2019 10:45:17 AM
To: Wang, Kevin(Yang); Rex Zhu; Quan, Evan; Deucher, Alexander; Koenig, 
Christian; Zhou, David(ChunMing); David Airlie; Daniel Vetter; 
[email protected]; [email protected]
Cc: [email protected]; [email protected]
Subject: [PATCH] drm/amd/powerplay: fix incorrect assignments to mclk_mask and 
soc_mask

From: Colin Ian King <[email protected]>

There are null pointer checks on mlck_mask and soc_mask however the
sclk_mask is being used in assignments in what looks to be a cut-n-paste
coding error. Fix this by using the correct pointers in the assignments.

Addresses-Coverity: ("Dereference after null check")
Fixes: 2d9fb9b06643 ("drm/amd/powerplay: add function get_profiling_clk_mask 
for navi10")
Signed-off-by: Colin Ian King <[email protected]>
---
 drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c 
b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
index 27e5c80..ac151da 100644
--- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
+++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
@@ -1134,14 +1134,14 @@ static int navi10_get_profiling_clk_mask(struct 
smu_context *smu,
                         ret = smu_get_dpm_level_count(smu, SMU_MCLK, 
&level_count);
                         if (ret)
                                 return ret;
-                       *sclk_mask = level_count - 1;
+                       *mclk_mask = level_count - 1;
                 }

                 if(soc_mask) {
                         ret = smu_get_dpm_level_count(smu, SMU_SOCCLK, 
&level_count);
                         if (ret)
                                 return ret;
-                       *sclk_mask = level_count - 1;
+                       *soc_mask = level_count - 1;
                 }
         }

--
2.7.4

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

Reply via email to