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

Commit 90208427 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon/dpm: add late_enable for CI 



Make sure interrupts are enabled
before we enable thermal interrupts.
Also, don't powergate uvd until after
the ring tests.

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

drivers/gpu/drm/radeon/ci_dpm.c

+29 −0
Original line number Diff line number Diff line
@@ -4685,6 +4685,35 @@ int ci_dpm_enable(struct radeon_device *rdev) 
	return 0;

}



int ci_dpm_late_enable(struct radeon_device *rdev)

{

	int ret;



	if (rdev->irq.installed &&

	    r600_is_internal_thermal_sensor(rdev->pm.int_thermal_type)) {

#if 0

		PPSMC_Result result;

#endif

		ret = ci_set_thermal_temperature_range(rdev, R600_TEMP_RANGE_MIN, R600_TEMP_RANGE_MAX);

		if (ret) {

			DRM_ERROR("ci_set_thermal_temperature_range failed\n");

			return ret;

		}

		rdev->irq.dpm_thermal = true;

		radeon_irq_set(rdev);

#if 0

		result = ci_send_msg_to_smc(rdev, PPSMC_MSG_EnableThermalInterrupt);



		if (result != PPSMC_Result_OK)

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

#endif

	}



	ci_dpm_powergate_uvd(rdev, true);



	return 0;

}



void ci_dpm_disable(struct radeon_device *rdev)

{

	struct ci_power_info *pi = ci_get_pi(rdev);

drivers/gpu/drm/radeon/radeon_asic.c

+1 −0
Original line number Diff line number Diff line
@@ -2067,6 +2067,7 @@ static struct radeon_asic ci_asic = { 
		.init = &ci_dpm_init,

		.setup_asic = &ci_dpm_setup_asic,

		.enable = &ci_dpm_enable,

		.late_enable = &ci_dpm_late_enable,

		.disable = &ci_dpm_disable,

		.pre_set_power_state = &ci_dpm_pre_set_power_state,

		.set_power_state = &ci_dpm_set_power_state,

drivers/gpu/drm/radeon/radeon_asic.h

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


int ci_dpm_init(struct radeon_device *rdev);

int ci_dpm_enable(struct radeon_device *rdev);

int ci_dpm_late_enable(struct radeon_device *rdev);

void ci_dpm_disable(struct radeon_device *rdev);

int ci_dpm_pre_set_power_state(struct radeon_device *rdev);

int ci_dpm_set_power_state(struct radeon_device *rdev);