Commit 2e41a874 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amd/powerplay: support retrieving clock information from other sysplls 



There will be some needs to retrieve clock information from other
sysplls also except default 0.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3a301bc5

drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c

+14 −13
Original line number Diff line number Diff line
@@ -489,15 +489,16 @@ int pp_atomfwctrl_get_gpio_information(struct pp_hwmgr *hwmgr, 
}



int pp_atomfwctrl_get_clk_information_by_clkid(struct pp_hwmgr *hwmgr,

					       uint8_t id, uint32_t *frequency)

					       uint8_t clk_id, uint8_t syspll_id,

					       uint32_t *frequency)

{

	struct amdgpu_device *adev = hwmgr->adev;

	struct atom_get_smu_clock_info_parameters_v3_1   parameters;

	struct atom_get_smu_clock_info_output_parameters_v3_1 *output;

	uint32_t ix;



	parameters.clk_id = id;

	parameters.syspll_id = 0;

	parameters.clk_id = clk_id;

	parameters.syspll_id = syspll_id;

	parameters.command = GET_SMU_CLOCK_INFO_V3_1_GET_CLOCK_FREQ;

	parameters.dfsdid = 0;
@@ -530,19 +531,19 @@ static void pp_atomfwctrl_copy_vbios_bootup_values_3_2(struct pp_hwmgr *hwmgr, 
	boot_values->ulSocClk   = 0;

	boot_values->ulDCEFClk   = 0;



	if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU11_SYSPLL0_SOCCLK_ID, &frequency))

	if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU11_SYSPLL0_SOCCLK_ID, SMU11_SYSPLL0_ID, &frequency))

		boot_values->ulSocClk   = frequency;



	if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU11_SYSPLL0_DCEFCLK_ID, &frequency))

	if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU11_SYSPLL0_DCEFCLK_ID, SMU11_SYSPLL0_ID, &frequency))

		boot_values->ulDCEFClk  = frequency;



	if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU11_SYSPLL0_ECLK_ID, &frequency))

	if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU11_SYSPLL0_ECLK_ID, SMU11_SYSPLL0_ID, &frequency))

		boot_values->ulEClk     = frequency;



	if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU11_SYSPLL0_VCLK_ID, &frequency))

	if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU11_SYSPLL0_VCLK_ID, SMU11_SYSPLL0_ID, &frequency))

		boot_values->ulVClk     = frequency;



	if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU11_SYSPLL0_DCLK_ID, &frequency))

	if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU11_SYSPLL0_DCLK_ID, SMU11_SYSPLL0_ID, &frequency))

		boot_values->ulDClk     = frequency;

}
@@ -563,19 +564,19 @@ static void pp_atomfwctrl_copy_vbios_bootup_values_3_1(struct pp_hwmgr *hwmgr, 
	boot_values->ulSocClk   = 0;

	boot_values->ulDCEFClk   = 0;



	if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU9_SYSPLL0_SOCCLK_ID, &frequency))

	if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU9_SYSPLL0_SOCCLK_ID, 0, &frequency))

		boot_values->ulSocClk   = frequency;



	if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU9_SYSPLL0_DCEFCLK_ID, &frequency))

	if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU9_SYSPLL0_DCEFCLK_ID, 0, &frequency))

		boot_values->ulDCEFClk  = frequency;



	if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU9_SYSPLL0_ECLK_ID, &frequency))

	if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU9_SYSPLL0_ECLK_ID, 0, &frequency))

		boot_values->ulEClk     = frequency;



	if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU9_SYSPLL0_VCLK_ID, &frequency))

	if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU9_SYSPLL0_VCLK_ID, 0, &frequency))

		boot_values->ulVClk     = frequency;



	if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU9_SYSPLL0_DCLK_ID, &frequency))

	if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU9_SYSPLL0_DCLK_ID, 0, &frequency))

		boot_values->ulDClk     = frequency;

}

drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h

+2 −1
Original line number Diff line number Diff line
@@ -236,7 +236,8 @@ int pp_atomfwctrl_get_vbios_bootup_values(struct pp_hwmgr *hwmgr, 
int pp_atomfwctrl_get_smc_dpm_information(struct pp_hwmgr *hwmgr,

			struct pp_atomfwctrl_smc_dpm_parameters *param);

int pp_atomfwctrl_get_clk_information_by_clkid(struct pp_hwmgr *hwmgr,

					uint8_t id, uint32_t *frequency);

					uint8_t clk_id, uint8_t syspll_id,

					uint32_t *frequency);



#endif

drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c

+2 −2
Original line number Diff line number Diff line
@@ -2575,10 +2575,10 @@ static int vega10_init_smc_table(struct pp_hwmgr *hwmgr) 
		data->vbios_boot_state.gfx_clock = boot_up_values.ulGfxClk;

		data->vbios_boot_state.mem_clock = boot_up_values.ulUClk;

		pp_atomfwctrl_get_clk_information_by_clkid(hwmgr,

				SMU9_SYSPLL0_SOCCLK_ID, &boot_up_values.ulSocClk);

				SMU9_SYSPLL0_SOCCLK_ID, 0, &boot_up_values.ulSocClk);



		pp_atomfwctrl_get_clk_information_by_clkid(hwmgr,

				SMU9_SYSPLL0_DCEFCLK_ID, &boot_up_values.ulDCEFClk);

				SMU9_SYSPLL0_DCEFCLK_ID, 0, &boot_up_values.ulDCEFClk);



		data->vbios_boot_state.soc_clock = boot_up_values.ulSocClk;

		data->vbios_boot_state.dcef_clock = boot_up_values.ulDCEFClk;

CRA Git | Maintained and supported by SUSTech CRA and CCSE