Skip to content

Commit fed2601

Browse files
Ma Junpull[bot]
Ma Jun
authored and
pull[bot]
committed
drm/amdgpu/pm: Fix the power1_min_cap value
It's unreasonable to use 0 as the power1_min_cap when OD is disabled. So, use the same lower limit as the value used when OD is enabled. Fixes: 1958946 ("drm/amd/pm: Support for getting power1_cap_min value") Signed-off-by: Ma Jun <Jun.Ma2@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Acked-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org
1 parent 11ebb3b commit fed2601

File tree

5 files changed

+20
-25
lines changed

5 files changed

+20
-25
lines changed

‎drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,13 +1303,12 @@ static int arcturus_get_power_limit(struct smu_context *smu,
13031303
if (default_power_limit)
13041304
*default_power_limit = power_limit;
13051305

1306-
if (smu->od_enabled) {
1306+
if (smu->od_enabled)
13071307
od_percent_upper = le32_to_cpu(powerplay_table->overdrive_table.max[SMU_11_0_ODSETTING_POWERPERCENTAGE]);
1308-
od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_11_0_ODSETTING_POWERPERCENTAGE]);
1309-
} else {
1308+
else
13101309
od_percent_upper = 0;
1311-
od_percent_lower = 100;
1312-
}
1310+
1311+
od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_11_0_ODSETTING_POWERPERCENTAGE]);
13131312

13141313
dev_dbg(smu->adev->dev, "od percent upper:%d, od percent lower:%d (default power: %d)\n",
13151314
od_percent_upper, od_percent_lower, power_limit);

‎drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2357,13 +2357,12 @@ static int navi10_get_power_limit(struct smu_context *smu,
23572357
*default_power_limit = power_limit;
23582358

23592359
if (smu->od_enabled &&
2360-
navi10_od_feature_is_supported(od_settings, SMU_11_0_ODCAP_POWER_LIMIT)) {
2360+
navi10_od_feature_is_supported(od_settings, SMU_11_0_ODCAP_POWER_LIMIT))
23612361
od_percent_upper = le32_to_cpu(powerplay_table->overdrive_table.max[SMU_11_0_ODSETTING_POWERPERCENTAGE]);
2362-
od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_11_0_ODSETTING_POWERPERCENTAGE]);
2363-
} else {
2362+
else
23642363
od_percent_upper = 0;
2365-
od_percent_lower = 100;
2366-
}
2364+
2365+
od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_11_0_ODSETTING_POWERPERCENTAGE]);
23672366

23682367
dev_dbg(smu->adev->dev, "od percent upper:%d, od percent lower:%d (default power: %d)\n",
23692368
od_percent_upper, od_percent_lower, power_limit);

‎drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -640,13 +640,12 @@ static int sienna_cichlid_get_power_limit(struct smu_context *smu,
640640
if (default_power_limit)
641641
*default_power_limit = power_limit;
642642

643-
if (smu->od_enabled) {
643+
if (smu->od_enabled)
644644
od_percent_upper = le32_to_cpu(powerplay_table->overdrive_table.max[SMU_11_0_7_ODSETTING_POWERPERCENTAGE]);
645-
od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_11_0_7_ODSETTING_POWERPERCENTAGE]);
646-
} else {
645+
else
647646
od_percent_upper = 0;
648-
od_percent_lower = 100;
649-
}
647+
648+
od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_11_0_7_ODSETTING_POWERPERCENTAGE]);
650649

651650
dev_dbg(smu->adev->dev, "od percent upper:%d, od percent lower:%d (default power: %d)\n",
652651
od_percent_upper, od_percent_lower, power_limit);

‎drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2369,13 +2369,12 @@ static int smu_v13_0_0_get_power_limit(struct smu_context *smu,
23692369
if (default_power_limit)
23702370
*default_power_limit = power_limit;
23712371

2372-
if (smu->od_enabled) {
2372+
if (smu->od_enabled)
23732373
od_percent_upper = le32_to_cpu(powerplay_table->overdrive_table.max[SMU_13_0_0_ODSETTING_POWERPERCENTAGE]);
2374-
od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_13_0_0_ODSETTING_POWERPERCENTAGE]);
2375-
} else {
2374+
else
23762375
od_percent_upper = 0;
2377-
od_percent_lower = 100;
2378-
}
2376+
2377+
od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_13_0_0_ODSETTING_POWERPERCENTAGE]);
23792378

23802379
dev_dbg(smu->adev->dev, "od percent upper:%d, od percent lower:%d (default power: %d)\n",
23812380
od_percent_upper, od_percent_lower, power_limit);

‎drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2333,13 +2333,12 @@ static int smu_v13_0_7_get_power_limit(struct smu_context *smu,
23332333
if (default_power_limit)
23342334
*default_power_limit = power_limit;
23352335

2336-
if (smu->od_enabled) {
2336+
if (smu->od_enabled)
23372337
od_percent_upper = le32_to_cpu(powerplay_table->overdrive_table.max[SMU_13_0_7_ODSETTING_POWERPERCENTAGE]);
2338-
od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_13_0_7_ODSETTING_POWERPERCENTAGE]);
2339-
} else {
2338+
else
23402339
od_percent_upper = 0;
2341-
od_percent_lower = 100;
2342-
}
2340+
2341+
od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_13_0_7_ODSETTING_POWERPERCENTAGE]);
23432342

23442343
dev_dbg(smu->adev->dev, "od percent upper:%d, od percent lower:%d (default power: %d)\n",
23452344
od_percent_upper, od_percent_lower, power_limit);

0 commit comments

Comments
 (0)