Commit f02c7336 authored by Xiaojian Du's avatar Xiaojian Du Committed by Alex Deucher
Browse files

drm/amd/pm: enable the "fetch" function of pp_dpm_vclk/dclk for vangogh 



This patch is to enable the "fetch" function of pp_dpm_vclk and
pp_dpm_dclk.
It allows to fetch the current frequency of vcn and dcn and their
DPM levels for vangogh.

Signed-off-by: default avatarXiaojian Du <Xiaojian.Du@amd.com>
Acked-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9577b0ec

drivers/gpu/drm/amd/pm/inc/smu11_driver_if_vangogh.h

+0 −1
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ typedef struct { 
  uint32_t MaxGfxClk;



  uint8_t NumDfPstatesEnabled;

  uint8_t NumDpmLevelsEnabled;

  uint8_t NumDcfclkLevelsEnabled;

  uint8_t NumDispClkLevelsEnabled;  //applies to both dispclk and dppclk

  uint8_t NumSocClkLevelsEnabled;

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

+30 −4
Original line number Diff line number Diff line
@@ -249,6 +249,12 @@ static int vangogh_get_smu_metrics_data(struct smu_context *smu, 
	case METRICS_AVERAGE_SOCCLK:

		*value = metrics->SocclkFrequency;

		break;

	case METRICS_AVERAGE_VCLK:

		*value = metrics->VclkFrequency;

		break;

	case METRICS_AVERAGE_DCLK:

		*value = metrics->DclkFrequency;

		break;

	case METRICS_AVERAGE_UCLK:

		*value = metrics->MemclkFrequency;

		break;
@@ -434,6 +440,16 @@ static int vangogh_get_dpm_clk_limited(struct smu_context *smu, enum smu_clk_typ 
			return -EINVAL;

		*freq = clk_table->SocClocks[dpm_level];

		break;

	case SMU_VCLK:

		if (dpm_level >= clk_table->VcnClkLevelsEnabled)

			return -EINVAL;

		*freq = clk_table->VcnClocks[dpm_level].vclk;

		break;

	case SMU_DCLK:

		if (dpm_level >= clk_table->VcnClkLevelsEnabled)

			return -EINVAL;

		*freq = clk_table->VcnClocks[dpm_level].dclk;

		break;

	case SMU_UCLK:

	case SMU_MCLK:

		if (dpm_level >= clk_table->NumDfPstatesEnabled)
@@ -490,6 +506,14 @@ static int vangogh_print_fine_grain_clk(struct smu_context *smu, 
		count = clk_table->NumSocClkLevelsEnabled;

		cur_value = metrics.SocclkFrequency;

		break;

	case SMU_VCLK:

		count = clk_table->VcnClkLevelsEnabled;

		cur_value = metrics.VclkFrequency;

		break;

	case SMU_DCLK:

		count = clk_table->VcnClkLevelsEnabled;

		cur_value = metrics.DclkFrequency;

		break;

	case SMU_MCLK:

		count = clk_table->NumDfPstatesEnabled;

		cur_value = metrics.MemclkFrequency;
@@ -506,6 +530,8 @@ static int vangogh_print_fine_grain_clk(struct smu_context *smu, 


	switch (clk_type) {

	case SMU_SOCCLK:

	case SMU_VCLK:

	case SMU_DCLK:

	case SMU_MCLK:

	case SMU_FCLK:

		for (i = 0; i < count; i++) {