[PATCH] drm/amd/powerplay: correct current clock level label for Arcturus

[Deucher, Alexander]

> -----Original Message-----
> From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> On Behalf Of
> Quan, Evan
> Sent: Thursday, October 24, 2019 2:25 AM
> To: amd-gfx at lists.freedesktop.org
> Cc: Li, Candice <Candice.Li at amd.com>; Quan, Evan <Evan.Quan at amd.com>
> Subject: [PATCH] drm/amd/powerplay: correct current clock level label for
> Arcturus
> 
> For dpm disabled case, it's assumed the only one support clock level is always
> current clock level.
> 
> Change-Id: I5cc2b7e82af888dc5e8268597ee761e9e1a26855
> Signed-off-by: Evan Quan <evan.quan at amd.com>

Acked-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 24 +++++++++++++------
> -
>  1 file changed, 16 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
> b/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
> index 1bcc5ab2873d..fcc9b6d24e8e 100644
> --- a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
> +++ b/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
> @@ -670,12 +670,17 @@ static int arcturus_print_clk_levels(struct
> smu_context *smu,
>  			return ret;
>  		}
> 
> +		/*
> +		 * For DPM disabled case, there will be only one clock level.
> +		 * And it's safe to assume that is always the current clock.
> +		 */
>  		for (i = 0; i < clocks.num_levels; i++)
>  			size += sprintf(buf + size, "%d: %uMhz %s\n", i,
>  					clocks.data[i].clocks_in_khz / 1000,
> -					arcturus_freqs_in_same_level(
> +					(clocks.num_levels == 1) ? "*" :
> +					(arcturus_freqs_in_same_level(
>  					clocks.data[i].clocks_in_khz / 1000,
> -					now / 100) ? "*" : "");
> +					now / 100) ? "*" : ""));
>  		break;
> 
>  	case SMU_MCLK:
> @@ -695,9 +700,10 @@ static int arcturus_print_clk_levels(struct
> smu_context *smu,
>  		for (i = 0; i < clocks.num_levels; i++)
>  			size += sprintf(buf + size, "%d: %uMhz %s\n",
>  				i, clocks.data[i].clocks_in_khz / 1000,
> -				arcturus_freqs_in_same_level(
> +				(clocks.num_levels == 1) ? "*" :
> +				(arcturus_freqs_in_same_level(
>  				clocks.data[i].clocks_in_khz / 1000,
> -				now / 100) ? "*" : "");
> +				now / 100) ? "*" : ""));
>  		break;
> 
>  	case SMU_SOCCLK:
> @@ -717,9 +723,10 @@ static int arcturus_print_clk_levels(struct
> smu_context *smu,
>  		for (i = 0; i < clocks.num_levels; i++)
>  			size += sprintf(buf + size, "%d: %uMhz %s\n",
>  				i, clocks.data[i].clocks_in_khz / 1000,
> -				arcturus_freqs_in_same_level(
> +				(clocks.num_levels == 1) ? "*" :
> +				(arcturus_freqs_in_same_level(
>  				clocks.data[i].clocks_in_khz / 1000,
> -				now / 100) ? "*" : "");
> +				now / 100) ? "*" : ""));
>  		break;
> 
>  	case SMU_FCLK:
> @@ -739,9 +746,10 @@ static int arcturus_print_clk_levels(struct
> smu_context *smu,
>  		for (i = 0; i < single_dpm_table->count; i++)
>  			size += sprintf(buf + size, "%d: %uMhz %s\n",
>  				i, single_dpm_table->dpm_levels[i].value,
> -				arcturus_freqs_in_same_level(
> +				(clocks.num_levels == 1) ? "*" :
> +				(arcturus_freqs_in_same_level(
>  				clocks.data[i].clocks_in_khz / 1000,
> -				now / 100) ? "*" : "");
> +				now / 100) ? "*" : ""));
>  		break;
> 
>  	default:
> --
> 2.23.0
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx