Commit 543faf57 authored by Darren Powell's avatar Darren Powell Committed by Alex Deucher
Browse files

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: default avatarDarren Powell <darren.powell@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ab8529b0

drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c

+5 −4
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c

+5 −4
Original line number Diff line number Diff line
@@ -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;