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

drm/radeon/dpm: switch on new late_enable callback 



Right now it's called right after enable, but after
reworking the dpm init order, it will get called later
to accomodate loading the smc early, but enabling
thermal interrupts and block powergating later after
the ring tests are complete.

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

drivers/gpu/drm/radeon/btc_dpm.c

+0 −15
Original line number Diff line number Diff line
@@ -2510,21 +2510,6 @@ int btc_dpm_enable(struct radeon_device *rdev) 
	if (eg_pi->ls_clock_gating)

		btc_ls_clock_gating_enable(rdev, true);



	if (rdev->irq.installed &&

	    r600_is_internal_thermal_sensor(rdev->pm.int_thermal_type)) {

		PPSMC_Result result;



		ret = rv770_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 = rv770_send_msg_to_smc(rdev, PPSMC_MSG_EnableThermalInterrupt);



		if (result != PPSMC_Result_OK)

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

	}



	rv770_enable_auto_throttle_source(rdev, RADEON_DPM_AUTO_THROTTLE_SRC_THERMAL, true);



	btc_init_stutter_mode(rdev);

drivers/gpu/drm/radeon/ci_dpm.c

+0 −21
Original line number Diff line number Diff line
@@ -4656,30 +4656,9 @@ int ci_dpm_enable(struct radeon_device *rdev) 
		DRM_ERROR("ci_enable_power_containment failed\n");

		return 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_enable_auto_throttle_source(rdev, RADEON_DPM_AUTO_THROTTLE_SRC_THERMAL, true);



	ci_dpm_powergate_uvd(rdev, true);



	ci_update_current_ps(rdev, boot_ps);



	return 0;

drivers/gpu/drm/radeon/cypress_dpm.c

+0 −15
Original line number Diff line number Diff line
@@ -1905,21 +1905,6 @@ int cypress_dpm_enable(struct radeon_device *rdev) 
	if (pi->mg_clock_gating)

		cypress_mg_clock_gating_enable(rdev, true);



	if (rdev->irq.installed &&

	    r600_is_internal_thermal_sensor(rdev->pm.int_thermal_type)) {

		PPSMC_Result result;



		ret = rv770_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 = rv770_send_msg_to_smc(rdev, PPSMC_MSG_EnableThermalInterrupt);



		if (result != PPSMC_Result_OK)

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

	}



	rv770_enable_auto_throttle_source(rdev, RADEON_DPM_AUTO_THROTTLE_SRC_THERMAL, true);



	return 0;

drivers/gpu/drm/radeon/kv_dpm.c

+0 −17
Original line number Diff line number Diff line
@@ -1210,29 +1210,12 @@ int kv_dpm_enable(struct radeon_device *rdev) 


	kv_reset_acp_boot_level(rdev);



	if (rdev->irq.installed &&

	    r600_is_internal_thermal_sensor(rdev->pm.int_thermal_type)) {

		ret = kv_set_thermal_temperature_range(rdev, R600_TEMP_RANGE_MIN, R600_TEMP_RANGE_MAX);

		if (ret) {

			DRM_ERROR("kv_set_thermal_temperature_range failed\n");

			return ret;

		}

		rdev->irq.dpm_thermal = true;

		radeon_irq_set(rdev);

	}



	ret = kv_smc_bapm_enable(rdev, false);

	if (ret) {

		DRM_ERROR("kv_smc_bapm_enable failed\n");

		return ret;

	}



	/* powerdown unused blocks for now */

	kv_dpm_powergate_acp(rdev, true);

	kv_dpm_powergate_samu(rdev, true);

	kv_dpm_powergate_vce(rdev, true);

	kv_dpm_powergate_uvd(rdev, true);



	kv_update_current_ps(rdev, rdev->pm.dpm.boot_ps);



	return ret;

drivers/gpu/drm/radeon/ni_dpm.c

+0 −15
Original line number Diff line number Diff line
@@ -3710,21 +3710,6 @@ int ni_dpm_enable(struct radeon_device *rdev) 
	if (eg_pi->ls_clock_gating)

		ni_ls_clockgating_enable(rdev, true);



	if (rdev->irq.installed &&

	    r600_is_internal_thermal_sensor(rdev->pm.int_thermal_type)) {

		PPSMC_Result result;



		ret = rv770_set_thermal_temperature_range(rdev, R600_TEMP_RANGE_MIN, 0xff * 1000);

		if (ret)

			return ret;

		rdev->irq.dpm_thermal = true;

		radeon_irq_set(rdev);

		result = rv770_send_msg_to_smc(rdev, PPSMC_MSG_EnableThermalInterrupt);



		if (result != PPSMC_Result_OK)

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

	}



	rv770_enable_auto_throttle_source(rdev, RADEON_DPM_AUTO_THROTTLE_SRC_THERMAL, true);



	ni_update_current_ps(rdev, boot_ps);

CRA Git | Maintained and supported by SUSTech CRA and CCSE