drm/amdgpu: align pp_power_profile_mode with kernel docs
Subsystems (3)
Alex Deucher
maintainerPATCH 1/2 drm/amdgpu: align pp_power_profile_mode with kernel docs
The kernel doc says you need to select manual mode to adjust this, but the code only allows you to adjust it when manual mode is not selected. Remove the manual mode check.
--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +2 -4
@@ -2266,8 +2266,7 @@ static int smu_adjust_power_state_dynamic(struct smu_context *smu, smu_dpm_ctx->dpm_level = level; } -if (smu_dpm_ctx->dpm_level !=AMD_DPM_FORCED_LEVEL_MANUAL && - smu_dpm_ctx->dpm_level !=AMD_DPM_FORCED_LEVEL_PERF_DETERMINISM ) { +if (smu_dpm_ctx->dpm_level !=AMD_DPM_FORCED_LEVEL_PERF_DETERMINISM ) { index =fls (smu->workload_mask); index = index >0 && index <=WORKLOAD_POLICY_MAX ? index -1 :0 ; workload[0 ] = smu->workload_setting[index];
@@ -2346,8 +2345,7 @@ static int smu_switch_power_profile(void *handle, workload[0 ] = smu->workload_setting[index]; } -if (smu_dpm_ctx->dpm_level !=AMD_DPM_FORCED_LEVEL_MANUAL && - smu_dpm_ctx->dpm_level !=AMD_DPM_FORCED_LEVEL_PERF_DETERMINISM ) +if (smu_dpm_ctx->dpm_level !=AMD_DPM_FORCED_LEVEL_PERF_DETERMINISM )smu_bump_power_profile_mode (smu, workload,0 );return 0 ;
Signature · 1 line
2.46.0
Alex Deucher
maintainerPATCH 2/2 drm/amdgpu/swsmu: fix ordering for setting workload_mask
No change in functionality for the current code, but we need to set the index properly before changing it if we ever use a non-0 index.
--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +1 -1
@@ -1257,7 +1257,6 @@ static int smu_sw_init(void *handle)atomic_set (&smu->smu_power.power_gate.vpe_gated,1 );atomic_set (&smu->smu_power.power_gate.umsch_mm_gated,1 ); - smu->workload_mask =1 << smu->workload_prority[PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT ]; smu->workload_prority[PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT ] =0 ; smu->workload_prority[PP_SMC_POWER_PROFILE_FULLSCREEN3D ] =1 ; smu->workload_prority[PP_SMC_POWER_PROFILE_POWERSAVING ] =2 ;
@@ -1265,6 +1264,7 @@ static int smu_sw_init(void *handle) smu->workload_prority[PP_SMC_POWER_PROFILE_VR ] =4 ; smu->workload_prority[PP_SMC_POWER_PROFILE_COMPUTE ] =5 ; smu->workload_prority[PP_SMC_POWER_PROFILE_CUSTOM ] =6 ; + smu->workload_mask =1 << smu->workload_prority[PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT ]; smu->workload_setting[0 ] =PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT ; smu->workload_setting[1 ] =PP_SMC_POWER_PROFILE_FULLSCREEN3D ;
Signature · 1 line
2.46.0
Feng, Kenneth
maintainerRE: [PATCH 2/2] drm/amdgpu/swsmu: fix ordering for setting workload_mask
[AMD Official Use Only - AMD Internal Distribution Only]
Series is Reviewed-by: Kenneth Feng <[email protected]>
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Alex Deucher
Sent: Friday, August 23, 2024 10:12 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: [PATCH 2/2] drm/amdgpu/swsmu: fix ordering for setting workload_mask
Caution: This message originated from an External Source. Use proper caution when opening attachments, clicking links, or responding.
No change in functionality for the current code, but we need to set the index properly before changing it if we ever use a non-0 index.
--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0 -1
@@ -1257,7 +1257,6 @@ static int smu_sw_init(void *handle)atomic_set (&smu->smu_power.power_gate.vpe_gated,1 );atomic_set (&smu->smu_power.power_gate.umsch_mm_gated,1 ); - smu->workload_mask =1 << smu->workload_prority[PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT ]; smu->workload_prority[PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT ] =0 ; smu->workload_prority[PP_SMC_POWER_PROFILE_FULLSCREEN3D ] =1 ; smu->workload_prority[PP_SMC_POWER_PROFILE_POWERSAVING] = 2; @@ -1265,6 +1264,7 @@ static int smu_sw_init(void *handle)
smu->workload_prority[PP_SMC_POWER_PROFILE_VR] = 4;
smu->workload_prority[PP_SMC_POWER_PROFILE_COMPUTE] = 5;
smu->workload_prority[PP_SMC_POWER_PROFILE_CUSTOM] = 6;+ smu->workload_mask = 1 <<
+ smu->workload_prority[PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT];
smu->workload_setting[0] = PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT;
smu->workload_setting[1] = PP_SMC_POWER_PROFILE_FULLSCREEN3D;--
2.46.0