From: Alex Deucher <alexander.deucher@xxxxxxx>
commit 11510e67d0bd956878ab4ffa03c45766788092c1 upstream.
Only apply when compute profile is selected. This is
the only supported configuration. Selecting other
profiles can lead to performane degradations.
Reviewed-by: Kenneth Feng <kenneth.feng@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
(cherry picked from commit d477e39532d725b1cdb3c8005c689c74ffbf3b94)
Cc: stable@xxxxxxxxxxxxxxx # 6.12.x
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
@@ -2549,11 +2549,12 @@ static int smu_v13_0_0_set_power_profile
&backend_workload_mask);
/* Add optimizations for SMU13.0.0/10. Reuse the power saving profile */
- if ((amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 0) &&
- ((smu->adev->pm.fw_version == 0x004e6601) ||
- (smu->adev->pm.fw_version >= 0x004e7300))) ||
- (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 10) &&
- smu->adev->pm.fw_version >= 0x00504500)) {
+ if ((workload_mask & (1 << PP_SMC_POWER_PROFILE_COMPUTE)) &&
+ ((amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 0) &&
+ ((smu->adev->pm.fw_version == 0x004e6601) ||
+ (smu->adev->pm.fw_version >= 0x004e7300))) ||
+ (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 10) &&
+ smu->adev->pm.fw_version >= 0x00504500))) {
workload_type = smu_cmn_to_asic_specific_index(smu,
CMN2ASIC_MAPPING_WORKLOAD,
PP_SMC_POWER_PROFILE_POWERSAVING);
Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are
queue-6.12/drm-amdgpu-smu13-update-powersave-optimizations.patch
queue-6.12/drm-amdgpu-fix-fw-attestation-for-mp0_14_0_-2-3.patch
queue-6.12/drm-amd-display-do-not-wait-for-psr-disable-on-vbl-enable.patch
queue-6.12/drm-amd-display-disable-replay-and-psr-while-vrr-is-enabled.patch
queue-6.12/revert-drm-amd-display-enable-urgent-latency-adjustments-for-dcn35.patch
queue-6.12/drm-amd-display-validate-mdoe-under-mst-lct-1-case-as-well.patch
queue-6.12/drm-amd-display-fix-psr-su-not-support-but-still-call-the-amdgpu_dm_psr_enable.patch
queue-6.12/drm-amd-display-do-not-elevate-mem_type-change-to-full-update.patch
queue-6.12/drm-amdgpu-always-sync-the-gfx-pipe-on-ctx-switch.patch
queue-6.12/drm-amdgpu-disable-gfxoff-with-the-compute-workload-on-gfx12.patch
