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

drm/amdgpu/swsmu: Only force workload setup on init 

Needed to set the workload type at init time so that
we can apply the navi3x margin optimization.

Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3618
Link: https://gitlab.freedesktop.org/drm/amd/-/issues/3131


Fixes: c50fe289 ("drm/amdgpu/swsmu: always force a state reprogram on init")
Reviewed-by: default avatarKenneth Feng <kenneth.feng@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 580ad7cb)
Cc: stable@vger.kernel.org
parent 28127dba

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

+3 −3
Original line number Diff line number Diff line
@@ -2226,7 +2226,7 @@ static int smu_bump_power_profile_mode(struct smu_context *smu, 
static int smu_adjust_power_state_dynamic(struct smu_context *smu,

					  enum amd_dpm_forced_level level,

					  bool skip_display_settings,

					  bool force_update)

					  bool init)

{

	int ret = 0;

	int index = 0;
@@ -2255,7 +2255,7 @@ static int smu_adjust_power_state_dynamic(struct smu_context *smu, 
		}

	}



	if (force_update || smu_dpm_ctx->dpm_level != level) {

	if (smu_dpm_ctx->dpm_level != level) {

		ret = smu_asic_set_performance_level(smu, level);

		if (ret) {

			dev_err(smu->adev->dev, "Failed to set performance level!");
@@ -2272,7 +2272,7 @@ static int smu_adjust_power_state_dynamic(struct smu_context *smu, 
		index = index > 0 && index <= WORKLOAD_POLICY_MAX ? index - 1 : 0;

		workload[0] = smu->workload_setting[index];



		if (force_update || smu->power_profile_mode != workload[0])

		if (init || smu->power_profile_mode != workload[0])

			smu_bump_power_profile_mode(smu, workload, 0);

	}