Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c24131ef authored by Qiu Wenbo's avatar Qiu Wenbo Committed by Greg Kroah-Hartman
Browse files

drm/amd/powerplay: fix a crash when overclocking Vega M 

commit 88bb16ad998a0395fe4b346b7d3f621aaa0a2324 upstream.

Avoid kernel crash when vddci_control is SMU7_VOLTAGE_CONTROL_NONE and
vddci_voltage_table is empty. It has been tested on Intel Hades Canyon
(i7-8809G).

Bug: https://bugzilla.kernel.org/show_bug.cgi?id=208489


Fixes: ac7822b0 ("drm/amd/powerplay: add smumgr support for VEGAM (v2)")
Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarQiu Wenbo <qiuwenbo@phytium.com.cn>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9468cf97

drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c

+6 −4
Original line number Diff line number Diff line
@@ -643,9 +643,6 @@ static int vegam_get_dependency_volt_by_clk(struct pp_hwmgr *hwmgr, 


	/* sclk is bigger than max sclk in the dependence table */

	*voltage |= (dep_table->entries[i - 1].vddc * VOLTAGE_SCALE) << VDDC_SHIFT;

	vddci = phm_find_closest_vddci(&(data->vddci_voltage_table),

			(dep_table->entries[i - 1].vddc -

					(uint16_t)VDDC_VDDCI_DELTA));



	if (SMU7_VOLTAGE_CONTROL_NONE == data->vddci_control)

		*voltage |= (data->vbios_boot_state.vddci_bootup_value *
@@ -653,8 +650,13 @@ static int vegam_get_dependency_volt_by_clk(struct pp_hwmgr *hwmgr, 
	else if (dep_table->entries[i - 1].vddci)

		*voltage |= (dep_table->entries[i - 1].vddci *

				VOLTAGE_SCALE) << VDDC_SHIFT;

	else

	else {

		vddci = phm_find_closest_vddci(&(data->vddci_voltage_table),

				(dep_table->entries[i - 1].vddc -

						(uint16_t)VDDC_VDDCI_DELTA));



		*voltage |= (vddci * VOLTAGE_SCALE) << VDDCI_SHIFT;

	}



	if (SMU7_VOLTAGE_CONTROL_NONE == data->mvdd_control)

		*mvdd = data->vbios_boot_state.mvdd_bootup_value * VOLTAGE_SCALE;