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

drm/amd/pm: decouple the watermark table setting from socclk/uclk dpms 



As they have no real dependence. And for Navi1x, the socclk/uclk dpms
are enabled after DAL initialization.

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 b226ef95

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c

+7 −8
Original line number Diff line number Diff line
@@ -1818,18 +1818,17 @@ int smu_set_watermarks_for_clock_ranges(struct smu_context *smu, 
	if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)

		return -EOPNOTSUPP;



	if (smu->disable_watermark)

		return 0;



	mutex_lock(&smu->mutex);



	if (!smu->disable_watermark &&

			smu_feature_is_enabled(smu, SMU_FEATURE_DPM_DCEFCLK_BIT) &&

			smu_feature_is_enabled(smu, SMU_FEATURE_DPM_SOCCLK_BIT)) {

	ret = smu_set_watermarks_table(smu, clock_ranges);



	if (!(smu->watermarks_bitmap & WATERMARKS_EXIST)) {

		smu->watermarks_bitmap |= WATERMARKS_EXIST;

		smu->watermarks_bitmap &= ~WATERMARKS_LOADED;

	}

	}



	mutex_unlock(&smu->mutex);