Skip to content

Commit

Permalink
drm/amdgpu/smu13: fix profile reporting
Browse files Browse the repository at this point in the history
The following 3 commits landed in parallel:
commit d7d2688 ("drm/amd/pm: update workload mask after the setting")
commit 7a1613e ("drm/amdgpu/smu13: always apply the powersave optimization")
commit 7c210ca ("drm/amdgpu: handle default profile on on devices without fullscreen 3D")
While everything is set correctly, this caused the profile to be
reported incorrectly because both the powersave and fullscreen3d bits
were set in the mask and when the driver prints the profile, it looks
for the first bit set.

Fixes: d7d2688 ("drm/amd/pm: update workload mask after the setting")
Signed-off-by: Alex Deucher <[email protected]>
  • Loading branch information
alexdeucher authored and 1Naim committed Oct 25, 2024
1 parent a17e226 commit 0d59c73
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
Original file line number Diff line number Diff line change
Expand Up @@ -2485,7 +2485,7 @@ static int smu_v13_0_0_set_power_profile_mode(struct smu_context *smu,
DpmActivityMonitorCoeffInt_t *activity_monitor =
&(activity_monitor_external.DpmActivityMonitorCoeffInt);
int workload_type, ret = 0;
u32 workload_mask;
u32 workload_mask, selected_workload_mask;

smu->power_profile_mode = input[size];

Expand Down Expand Up @@ -2552,7 +2552,7 @@ static int smu_v13_0_0_set_power_profile_mode(struct smu_context *smu,
if (workload_type < 0)
return -EINVAL;

workload_mask = 1 << workload_type;
selected_workload_mask = workload_mask = 1 << workload_type;

/* 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) &&
Expand All @@ -2572,7 +2572,7 @@ static int smu_v13_0_0_set_power_profile_mode(struct smu_context *smu,
workload_mask,
NULL);
if (!ret)
smu->workload_mask = workload_mask;
smu->workload_mask = selected_workload_mask;

return ret;
}
Expand Down

0 comments on commit 0d59c73

Please sign in to comment.