amdgpu/pm: Fix incorrect variable for size of clocks array

 [v2]
No Changes, added RB
 [v1]
Size of pp_clock_levels_with_latency is PP_MAX_CLOCK_LEVELS, not MAX_NUM_CLOCKS.
Both are currently defined as 16, modifying in case one value is modified in future
Changed code in both arcturus and aldabaran.

Also removed unneeded var count, and used min_t function

Signed-off-by: Darren Powell <darren.powell@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
index bfabcd3c45aa2a651506e95275aad8a855bc0a3e..445005571f76f0824a5fbc2483b07c397c65c105 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
@@ -573,12 +573,13 @@ static int arcturus_get_clk_table(struct smu_context *smu,
                        struct pp_clock_levels_with_latency *clocks,
                        struct smu_11_0_dpm_table *dpm_table)
 {
-       int i, count;
+       uint32_t i;
 
-       count = (dpm_table->count > MAX_NUM_CLOCKS) ? MAX_NUM_CLOCKS : dpm_table->count;
-       clocks->num_levels = count;
+       clocks->num_levels = min_t(uint32_t,
+                                  dpm_table->count,
+                                  (uint32_t)PP_MAX_CLOCK_LEVELS);
 
-       for (i = 0; i < count; i++) {
+       for (i = 0; i < clocks->num_levels; i++) {
                clocks->data[i].clocks_in_khz =
                        dpm_table->dpm_levels[i].value * 1000;
                clocks->data[i].latency_in_us = 0;

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
index 1133edd34e4d0b9ab775349a8fd3a4ad1b71155a..cc96a5b11d51d7c0796791ed17201e06cfb5f5a4 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
@@ -555,12 +555,13 @@ static int aldebaran_get_clk_table(struct smu_context *smu,
                                   struct pp_clock_levels_with_latency *clocks,
                                   struct smu_13_0_dpm_table *dpm_table)
 {
-       int i, count;
+       uint32_t i;
 
-       count = (dpm_table->count > MAX_NUM_CLOCKS) ? MAX_NUM_CLOCKS : dpm_table->count;
-       clocks->num_levels = count;
+       clocks->num_levels = min_t(uint32_t,
+                                  dpm_table->count,
+                                  (uint32_t)PP_MAX_CLOCK_LEVELS);
 
-       for (i = 0; i < count; i++) {
+       for (i = 0; i < clocks->num_levels; i++) {
                clocks->data[i].clocks_in_khz =
                        dpm_table->dpm_levels[i].value * 1000;
                clocks->data[i].latency_in_us = 0;