Commit 963c115d authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon/dpm: add late_enable for SI 



Make sure interrupts are enabled
before we enable thermal interrupts.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bda44c1a

drivers/gpu/drm/radeon/radeon_asic.c

+1 −0
Original line number Diff line number Diff line
@@ -1921,6 +1921,7 @@ static struct radeon_asic si_asic = { 
		.init = &si_dpm_init,

		.setup_asic = &si_dpm_setup_asic,

		.enable = &si_dpm_enable,

		.late_enable = &si_dpm_late_enable,

		.disable = &si_dpm_disable,

		.pre_set_power_state = &si_dpm_pre_set_power_state,

		.set_power_state = &si_dpm_set_power_state,

drivers/gpu/drm/radeon/radeon_asic.h

+1 −0
Original line number Diff line number Diff line
@@ -673,6 +673,7 @@ int si_get_temp(struct radeon_device *rdev); 
int si_dpm_init(struct radeon_device *rdev);

void si_dpm_setup_asic(struct radeon_device *rdev);

int si_dpm_enable(struct radeon_device *rdev);

int si_dpm_late_enable(struct radeon_device *rdev);

void si_dpm_disable(struct radeon_device *rdev);

int si_dpm_pre_set_power_state(struct radeon_device *rdev);

int si_dpm_set_power_state(struct radeon_device *rdev);

drivers/gpu/drm/radeon/si_dpm.c

+22 −0
Original line number Diff line number Diff line
@@ -5912,6 +5912,28 @@ int si_dpm_enable(struct radeon_device *rdev) 
	return 0;

}



int si_dpm_late_enable(struct radeon_device *rdev)

{

	int ret;



	if (rdev->irq.installed &&

	    r600_is_internal_thermal_sensor(rdev->pm.int_thermal_type)) {

		PPSMC_Result result;



		ret = si_set_thermal_temperature_range(rdev, R600_TEMP_RANGE_MIN, R600_TEMP_RANGE_MAX);

		if (ret)

			return ret;

		rdev->irq.dpm_thermal = true;

		radeon_irq_set(rdev);

		result = si_send_msg_to_smc(rdev, PPSMC_MSG_EnableThermalInterrupt);



		if (result != PPSMC_Result_OK)

			DRM_DEBUG_KMS("Could not enable thermal interrupts.\n");

	}



	return 0;

}



void si_dpm_disable(struct radeon_device *rdev)

{

	struct rv7xx_power_info *pi = rv770_get_pi(rdev);