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

drm/amd/powerplay: give better names for the thermal IRQ related APIs 



Thermal control is performed by PMFW. What handled in driver is
just whether or not to enable the alert(to driver).

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

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

+4 −4
Original line number Diff line number Diff line
@@ -1346,7 +1346,7 @@ static int smu_hw_init(void *handle) 
	if (ret)

		goto failed;



	ret = smu_start_thermal_control(smu);

	ret = smu_enable_thermal_alert(smu);

	if (ret)

		goto failed;
@@ -1392,7 +1392,7 @@ static int smu_hw_fini(void *handle) 


	smu_i2c_eeprom_fini(smu, &adev->pm.smu_i2c);



	ret = smu_stop_thermal_control(smu);

	ret = smu_disable_thermal_alert(smu);

	if (ret) {

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

		return ret;
@@ -1533,7 +1533,7 @@ static int smu_suspend(void *handle) 


	smu_i2c_eeprom_fini(smu, &adev->pm.smu_i2c);



	ret = smu_stop_thermal_control(smu);

	ret = smu_disable_thermal_alert(smu);

	if (ret) {

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

		return ret;
@@ -1578,7 +1578,7 @@ static int smu_resume(void *handle) 
	if (ret)

		goto failed;



	ret = smu_start_thermal_control(smu);

	ret = smu_enable_thermal_alert(smu);

	if (ret)

		goto failed;

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

+2 −2
Original line number Diff line number Diff line
@@ -2442,8 +2442,8 @@ static const struct pptable_funcs arcturus_ppt_funcs = { 
	.set_power_limit = smu_v11_0_set_power_limit,

	.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,

	.enable_thermal_alert = smu_v11_0_enable_thermal_alert,

	.disable_thermal_alert = smu_v11_0_disable_thermal_alert,

	.set_deep_sleep_dcefclk = smu_v11_0_set_deep_sleep_dcefclk,

	.display_clock_voltage_request = smu_v11_0_display_clock_voltage_request,

	.get_fan_control_mode = smu_v11_0_get_fan_control_mode,

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

+2 −2
Original line number Diff line number Diff line
@@ -530,8 +530,8 @@ struct pptable_funcs { 
	int (*set_power_limit)(struct smu_context *smu, uint32_t n);

	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 (*enable_thermal_alert)(struct smu_context *smu);

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

	int (*set_deep_sleep_dcefclk)(struct smu_context *smu, uint32_t clk);

	int (*set_active_display_count)(struct smu_context *smu, uint32_t count);

	int (*store_cc6_data)(struct smu_context *smu, uint32_t separation_time,

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

+2 −2
Original line number Diff line number Diff line
@@ -207,9 +207,9 @@ int smu_v11_0_get_current_clk_freq(struct smu_context *smu, 


int smu_v11_0_init_max_sustainable_clocks(struct smu_context *smu);



int smu_v11_0_start_thermal_control(struct smu_context *smu);

int smu_v11_0_enable_thermal_alert(struct smu_context *smu);



int smu_v11_0_stop_thermal_control(struct smu_context *smu);

int smu_v11_0_disable_thermal_alert(struct smu_context *smu);



int smu_v11_0_read_sensor(struct smu_context *smu,

				 enum amd_pp_sensors sensor,

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

+2 −2
Original line number Diff line number Diff line
@@ -2320,8 +2320,8 @@ static const struct pptable_funcs navi10_ppt_funcs = { 
	.set_power_limit = smu_v11_0_set_power_limit,

	.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,

	.enable_thermal_alert = smu_v11_0_enable_thermal_alert,

	.disable_thermal_alert = smu_v11_0_disable_thermal_alert,

	.set_deep_sleep_dcefclk = smu_v11_0_set_deep_sleep_dcefclk,

	.display_clock_voltage_request = smu_v11_0_display_clock_voltage_request,

	.get_fan_control_mode = smu_v11_0_get_fan_control_mode,

CRA Git | Maintained and supported by SUSTech CRA and CCSE