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

drm/amd/powerplay: do proper cleanups on hw_fini 



These are needed for smu_reset support.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarJack Gui <Jack.Gui@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c66846e0

drivers/gpu/drm/amd/powerplay/amdgpu_smu.c

+17 −0
Original line number Diff line number Diff line
@@ -1283,6 +1283,11 @@ static int smu_hw_init(void *handle) 
	return ret;

}



static int smu_stop_dpms(struct smu_context *smu)

{

	return smu_send_smc_msg(smu, SMU_MSG_DisableAllSmuFeatures);

}



static int smu_hw_fini(void *handle)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
@@ -1295,6 +1300,18 @@ static int smu_hw_fini(void *handle) 
		smu_powergate_vcn(&adev->smu, true);

	}



	ret = smu_stop_thermal_control(smu);

	if (ret) {

		pr_warn("Fail to stop thermal control!\n");

		return ret;

	}



	ret = smu_stop_dpms(smu);

	if (ret) {

		pr_warn("Fail to stop Dpms!\n");

		return ret;

	}



	kfree(table_context->driver_pptable);

	table_context->driver_pptable = NULL;

drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h

+3 −0
Original line number Diff line number Diff line
@@ -498,6 +498,7 @@ struct smu_funcs 
	int (*get_current_clk_freq)(struct smu_context *smu, enum smu_clk_type clk_id, uint32_t *value);

	int (*init_max_sustainable_clocks)(struct smu_context *smu);

	int (*start_thermal_control)(struct smu_context *smu);

	int (*stop_thermal_control)(struct smu_context *smu);

	int (*read_sensor)(struct smu_context *smu, enum amd_pp_sensors sensor,

			   void *data, uint32_t *size);

	int (*set_deep_sleep_dcefclk)(struct smu_context *smu, uint32_t clk);
@@ -647,6 +648,8 @@ struct smu_funcs 
	((smu)->ppt_funcs->set_thermal_fan_table ? (smu)->ppt_funcs->set_thermal_fan_table((smu)) : 0)

#define smu_start_thermal_control(smu) \

	((smu)->funcs->start_thermal_control? (smu)->funcs->start_thermal_control((smu)) : 0)

#define smu_stop_thermal_control(smu) \

	((smu)->funcs->stop_thermal_control? (smu)->funcs->stop_thermal_control((smu)) : 0)

#define smu_read_sensor(smu, sensor, data, size) \

	((smu)->ppt_funcs->read_sensor? (smu)->ppt_funcs->read_sensor((smu), (sensor), (data), (size)) : 0)

#define smu_smc_read_sensor(smu, sensor, data, size) \

drivers/gpu/drm/amd/powerplay/smu_v11_0.c

+10 −0
Original line number Diff line number Diff line
@@ -1212,6 +1212,15 @@ static int smu_v11_0_start_thermal_control(struct smu_context *smu) 
	return ret;

}



static int smu_v11_0_stop_thermal_control(struct smu_context *smu)

{

	struct amdgpu_device *adev = smu->adev;



	WREG32_SOC15(THM, 0, mmTHM_THERMAL_INT_ENA, 0);



	return 0;

}



static uint16_t convert_to_vddc(uint8_t vid)

{

	return (uint16_t) ((6200 - (vid * 25)) / SMU11_VOLTAGE_SCALE);
@@ -1787,6 +1796,7 @@ static const struct smu_funcs smu_v11_0_funcs = { 
	.get_current_clk_freq = smu_v11_0_get_current_clk_freq,

	.init_max_sustainable_clocks = smu_v11_0_init_max_sustainable_clocks,

	.start_thermal_control = smu_v11_0_start_thermal_control,

	.stop_thermal_control = smu_v11_0_stop_thermal_control,

	.read_sensor = smu_v11_0_read_sensor,

	.set_deep_sleep_dcefclk = smu_v11_0_set_deep_sleep_dcefclk,

	.display_clock_voltage_request = smu_v11_0_display_clock_voltage_request,