Commit 85e0689e authored by Horatio Zhang's avatar Horatio Zhang Committed by Alex Deucher
Browse files

drm/amd/pm: correct SMU13.0.7 max shader clock reporting 



Correct the max shader clock reporting on SMU
13.0.7.

Signed-off-by: default avatarHoratio Zhang <Hongkun.Zhang@amd.com>
Reviewed-by: default avatarKenneth Feng <kenneth.feng@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 6.1.x
parent f06b8887

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

+60 −1
Original line number Diff line number Diff line
@@ -575,6 +575,14 @@ static int smu_v13_0_7_set_default_dpm_table(struct smu_context *smu) 
						     dpm_table);

		if (ret)

			return ret;



		if (skutable->DriverReportedClocks.GameClockAc &&

			(dpm_table->dpm_levels[dpm_table->count - 1].value >

			skutable->DriverReportedClocks.GameClockAc)) {

			dpm_table->dpm_levels[dpm_table->count - 1].value =

				skutable->DriverReportedClocks.GameClockAc;

			dpm_table->max = skutable->DriverReportedClocks.GameClockAc;

		}

	} else {

		dpm_table->count = 1;

		dpm_table->dpm_levels[0].value = smu->smu_table.boot_values.gfxclk / 100;
@@ -828,6 +836,57 @@ static int smu_v13_0_7_get_smu_metrics_data(struct smu_context *smu, 
	return ret;

}



static int smu_v13_0_7_get_dpm_ultimate_freq(struct smu_context *smu,

					     enum smu_clk_type clk_type,

					     uint32_t *min,

					     uint32_t *max)

{

	struct smu_13_0_dpm_context *dpm_context =

		smu->smu_dpm.dpm_context;

	struct smu_13_0_dpm_table *dpm_table;



	switch (clk_type) {

	case SMU_MCLK:

	case SMU_UCLK:

		/* uclk dpm table */

		dpm_table = &dpm_context->dpm_tables.uclk_table;

		break;

	case SMU_GFXCLK:

	case SMU_SCLK:

		/* gfxclk dpm table */

		dpm_table = &dpm_context->dpm_tables.gfx_table;

		break;

	case SMU_SOCCLK:

		/* socclk dpm table */

		dpm_table = &dpm_context->dpm_tables.soc_table;

		break;

	case SMU_FCLK:

		/* fclk dpm table */

		dpm_table = &dpm_context->dpm_tables.fclk_table;

		break;

	case SMU_VCLK:

	case SMU_VCLK1:

		/* vclk dpm table */

		dpm_table = &dpm_context->dpm_tables.vclk_table;

		break;

	case SMU_DCLK:

	case SMU_DCLK1:

		/* dclk dpm table */

		dpm_table = &dpm_context->dpm_tables.dclk_table;

		break;

	default:

		dev_err(smu->adev->dev, "Unsupported clock type!\n");

		return -EINVAL;

	}



	if (min)

		*min = dpm_table->min;

	if (max)

		*max = dpm_table->max;



	return 0;

}



static int smu_v13_0_7_read_sensor(struct smu_context *smu,

				   enum amd_pp_sensors sensor,

				   void *data,
@@ -1684,7 +1743,7 @@ static const struct pptable_funcs smu_v13_0_7_ppt_funcs = { 
	.dpm_set_jpeg_enable = smu_v13_0_set_jpeg_enable,

	.init_pptable_microcode = smu_v13_0_init_pptable_microcode,

	.populate_umd_state_clk = smu_v13_0_7_populate_umd_state_clk,

	.get_dpm_ultimate_freq = smu_v13_0_get_dpm_ultimate_freq,

	.get_dpm_ultimate_freq = smu_v13_0_7_get_dpm_ultimate_freq,

	.get_vbios_bootup_values = smu_v13_0_get_vbios_bootup_values,

	.read_sensor = smu_v13_0_7_read_sensor,

	.feature_is_enabled = smu_cmn_feature_is_enabled,