* [PATCH] drm/amdgpu/pm: Don't use OD table on Arcturus
@ 2024-03-19 10:15 Ma Jun
2024-03-19 13:08 ` Alex Deucher
0 siblings, 1 reply; 2+ messages in thread
From: Ma Jun @ 2024-03-19 10:15 UTC (permalink / raw
To: amd-gfx; +Cc: Kenneth.Feng, Alexander.Deucher, kevinyang.wang, Ma Jun
OD is not supported on Arcturus, so the OD table
should not be used.
Signed-off-by: Ma Jun <Jun.Ma2@amd.com>
---
.../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 33 +++----------------
1 file changed, 5 insertions(+), 28 deletions(-)
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
index a58708bcda89..dc3a5d863a04 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
@@ -1289,11 +1289,8 @@ static int arcturus_get_power_limit(struct smu_context *smu,
uint32_t *max_power_limit,
uint32_t *min_power_limit)
{
- struct smu_11_0_powerplay_table *powerplay_table =
- (struct smu_11_0_powerplay_table *)smu->smu_table.power_play_table;
- struct smu_11_0_overdrive_table *od_settings = smu->od_settings;
PPTable_t *pptable = smu->smu_table.driver_pptable;
- uint32_t power_limit, od_percent_upper = 0, od_percent_lower = 0;
+ uint32_t power_limit;
if (smu_v11_0_get_current_power_limit(smu, &power_limit)) {
/* the last hope to figure out the ppt limit */
@@ -1309,30 +1306,10 @@ static int arcturus_get_power_limit(struct smu_context *smu,
*current_power_limit = power_limit;
if (default_power_limit)
*default_power_limit = power_limit;
-
- if (powerplay_table) {
- if (smu->od_enabled &&
- od_settings->cap[SMU_11_0_ODCAP_POWER_LIMIT]) {
- od_percent_upper = le32_to_cpu(powerplay_table->overdrive_table.max[SMU_11_0_ODSETTING_POWERPERCENTAGE]);
- od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_11_0_ODSETTING_POWERPERCENTAGE]);
- } else if (od_settings->cap[SMU_11_0_ODCAP_POWER_LIMIT]) {
- od_percent_upper = 0;
- od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_11_0_ODSETTING_POWERPERCENTAGE]);
- }
- }
-
- dev_dbg(smu->adev->dev, "od percent upper:%d, od percent lower:%d (default power: %d)\n",
- od_percent_upper, od_percent_lower, power_limit);
-
- if (max_power_limit) {
- *max_power_limit = power_limit * (100 + od_percent_upper);
- *max_power_limit /= 100;
- }
-
- if (min_power_limit) {
- *min_power_limit = power_limit * (100 - od_percent_lower);
- *min_power_limit /= 100;
- }
+ if (max_power_limit)
+ *max_power_limit = power_limit;
+ if (min_power_limit)
+ *min_power_limit = power_limit;
return 0;
}
--
2.34.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/amdgpu/pm: Don't use OD table on Arcturus
2024-03-19 10:15 [PATCH] drm/amdgpu/pm: Don't use OD table on Arcturus Ma Jun
@ 2024-03-19 13:08 ` Alex Deucher
0 siblings, 0 replies; 2+ messages in thread
From: Alex Deucher @ 2024-03-19 13:08 UTC (permalink / raw
To: Ma Jun; +Cc: amd-gfx, Kenneth.Feng, Alexander.Deucher, kevinyang.wang
On Tue, Mar 19, 2024 at 6:22 AM Ma Jun <Jun.Ma2@amd.com> wrote:
>
> OD is not supported on Arcturus, so the OD table
> should not be used.
>
> Signed-off-by: Ma Jun <Jun.Ma2@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 33 +++----------------
> 1 file changed, 5 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
> index a58708bcda89..dc3a5d863a04 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
> @@ -1289,11 +1289,8 @@ static int arcturus_get_power_limit(struct smu_context *smu,
> uint32_t *max_power_limit,
> uint32_t *min_power_limit)
> {
> - struct smu_11_0_powerplay_table *powerplay_table =
> - (struct smu_11_0_powerplay_table *)smu->smu_table.power_play_table;
> - struct smu_11_0_overdrive_table *od_settings = smu->od_settings;
> PPTable_t *pptable = smu->smu_table.driver_pptable;
> - uint32_t power_limit, od_percent_upper = 0, od_percent_lower = 0;
> + uint32_t power_limit;
>
> if (smu_v11_0_get_current_power_limit(smu, &power_limit)) {
> /* the last hope to figure out the ppt limit */
> @@ -1309,30 +1306,10 @@ static int arcturus_get_power_limit(struct smu_context *smu,
> *current_power_limit = power_limit;
> if (default_power_limit)
> *default_power_limit = power_limit;
> -
> - if (powerplay_table) {
> - if (smu->od_enabled &&
> - od_settings->cap[SMU_11_0_ODCAP_POWER_LIMIT]) {
> - od_percent_upper = le32_to_cpu(powerplay_table->overdrive_table.max[SMU_11_0_ODSETTING_POWERPERCENTAGE]);
> - od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_11_0_ODSETTING_POWERPERCENTAGE]);
> - } else if (od_settings->cap[SMU_11_0_ODCAP_POWER_LIMIT]) {
> - od_percent_upper = 0;
> - od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_11_0_ODSETTING_POWERPERCENTAGE]);
> - }
> - }
> -
> - dev_dbg(smu->adev->dev, "od percent upper:%d, od percent lower:%d (default power: %d)\n",
> - od_percent_upper, od_percent_lower, power_limit);
> -
> - if (max_power_limit) {
> - *max_power_limit = power_limit * (100 + od_percent_upper);
> - *max_power_limit /= 100;
> - }
> -
> - if (min_power_limit) {
> - *min_power_limit = power_limit * (100 - od_percent_lower);
> - *min_power_limit /= 100;
> - }
> + if (max_power_limit)
> + *max_power_limit = power_limit;
> + if (min_power_limit)
> + *min_power_limit = power_limit;
>
> return 0;
> }
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-03-19 13:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-19 10:15 [PATCH] drm/amdgpu/pm: Don't use OD table on Arcturus Ma Jun
2024-03-19 13:08 ` Alex Deucher
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.