[PATCH 1/2] Revert "drm/amd/pm: Use gpu_metrics_v1_6 for SMUv13.0.6"

[Lazar, Lijo]

On 5/20/2024 10:31 AM, Asad Kamal wrote:
> Remove gpu_metrics_v1_6 usage for SMUv13.0.6 temporarily and use
> gpu_metrics_v1_5 until tool support is ready for it.
> 
> This reverts commit e6efb71ae640eada28f44cc97aa79e8ae4901e63.
> 
> Signed-off-by: Asad Kamal <asad.kamal at amd.com>

Series is
	Reviewed-by: Lijo Lazar <lijo.lazar at amd.com>

Thanks,
Lijo

> ---
>  .../drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c   | 18 ++++--------------
>  1 file changed, 4 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
> index ceb2174baff6..81a241ed18f5 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
> @@ -351,7 +351,7 @@ static int smu_v13_0_6_tables_init(struct smu_context *smu)
>  		return -ENOMEM;
>  	smu_table->metrics_time = 0;
>  
> -	smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v1_6);
> +	smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v1_5);
>  	smu_table->gpu_metrics_table =
>  		kzalloc(smu_table->gpu_metrics_table_size, GFP_KERNEL);
>  	if (!smu_table->gpu_metrics_table) {
> @@ -2290,8 +2290,8 @@ static int smu_v13_0_6_get_current_pcie_link_speed(struct smu_context *smu)
>  static ssize_t smu_v13_0_6_get_gpu_metrics(struct smu_context *smu, void **table)
>  {
>  	struct smu_table_context *smu_table = &smu->smu_table;
> -	struct gpu_metrics_v1_6 *gpu_metrics =
> -		(struct gpu_metrics_v1_6 *)smu_table->gpu_metrics_table;
> +	struct gpu_metrics_v1_5 *gpu_metrics =
> +		(struct gpu_metrics_v1_5 *)smu_table->gpu_metrics_table;
>  	struct amdgpu_device *adev = smu->adev;
>  	int ret = 0, xcc_id, inst, i, j;
>  	MetricsTableX_t *metrics_x;
> @@ -2307,7 +2307,7 @@ static ssize_t smu_v13_0_6_get_gpu_metrics(struct smu_context *smu, void **table
>  
>  	metrics_a = (MetricsTableA_t *)metrics_x;
>  
> -	smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 6);
> +	smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 5);
>  
>  	gpu_metrics->temperature_hotspot =
>  		SMUQ10_ROUND(GET_METRIC_FIELD(MaxSocketTemperature));
> @@ -2349,16 +2349,6 @@ static ssize_t smu_v13_0_6_get_gpu_metrics(struct smu_context *smu, void **table
>  
>  	gpu_metrics->current_uclk = SMUQ10_ROUND(GET_METRIC_FIELD(UclkFrequency));
>  
> -	/* Total accumulated cycle counter */
> -	gpu_metrics->accumulation_counter = GET_METRIC_FIELD(AccumulationCounter);
> -
> -	/* Accumulated throttler residencies */
> -	gpu_metrics->prochot_residency_acc = GET_METRIC_FIELD(ProchotResidencyAcc);
> -	gpu_metrics->ppt_residency_acc = GET_METRIC_FIELD(PptResidencyAcc);
> -	gpu_metrics->socket_thm_residency_acc = GET_METRIC_FIELD(SocketThmResidencyAcc);
> -	gpu_metrics->vr_thm_residency_acc = GET_METRIC_FIELD(VrThmResidencyAcc);
> -	gpu_metrics->hbm_thm_residency_acc = GET_METRIC_FIELD(HbmThmResidencyAcc);
> -
>  	/* Throttle status is not reported through metrics now */
>  	gpu_metrics->throttle_status = 0;
>