release 6.11.7
This commit is contained in:
@@ -1,42 +0,0 @@
|
||||
From 3c881c7323af4269aa58848dd9da694d5a73d353 Mon Sep 17 00:00:00 2001
|
||||
From: Alex Deucher <alexander.deucher@amd.com>
|
||||
Date: Thu, 3 Oct 2024 09:57:38 -0400
|
||||
Subject: drm/amdgpu/swsmu: default to fullscreen 3D profile for dGPUs
|
||||
|
||||
This uses more aggressive hueristics than the the bootup default
|
||||
profile. On windows the OS has a special fullscreen 3D mode
|
||||
where this is used. Since we don't have the equivalent on Linux
|
||||
default to this profile for dGPUs.
|
||||
|
||||
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3618
|
||||
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/1500
|
||||
Link: https://gitlab.freedesktop.org/drm/amd/-/issues/3131
|
||||
Fixes: c50fe289ed72 ("drm/amdgpu/swsmu: always force a state reprogram on init")
|
||||
Reviewed-by: Kenneth Feng <kenneth.feng@amd.com>
|
||||
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
|
||||
---
|
||||
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
|
||||
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
|
||||
@@ -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;
|
||||
@@ -1266,6 +1265,11 @@ static int smu_sw_init(void *handle)
|
||||
smu->workload_prority[PP_SMC_POWER_PROFILE_COMPUTE] = 5;
|
||||
smu->workload_prority[PP_SMC_POWER_PROFILE_CUSTOM] = 6;
|
||||
|
||||
+ if (smu->is_apu)
|
||||
+ smu->workload_mask = 1 << smu->workload_prority[PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT];
|
||||
+ else
|
||||
+ smu->workload_mask = 1 << smu->workload_prority[PP_SMC_POWER_PROFILE_FULLSCREEN3D];
|
||||
+
|
||||
smu->workload_setting[0] = PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT;
|
||||
smu->workload_setting[1] = PP_SMC_POWER_PROFILE_FULLSCREEN3D;
|
||||
smu->workload_setting[2] = PP_SMC_POWER_PROFILE_POWERSAVING;
|
@@ -61,7 +61,7 @@ Subject: ZEN: drm/amdgpu/pm: Allow override of min_power_limit with
|
||||
|
||||
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
|
||||
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
|
||||
@@ -2762,7 +2762,10 @@ int smu_get_power_limit(void *handle,
|
||||
@@ -2775,7 +2775,10 @@ int smu_get_power_limit(void *handle,
|
||||
*limit = smu->max_power_limit;
|
||||
break;
|
||||
case SMU_PPT_LIMIT_MIN:
|
||||
@@ -73,7 +73,7 @@ Subject: ZEN: drm/amdgpu/pm: Allow override of min_power_limit with
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
@@ -2786,7 +2789,14 @@ static int smu_set_power_limit(void *han
|
||||
@@ -2799,7 +2802,14 @@ static int smu_set_power_limit(void *han
|
||||
if (smu->ppt_funcs->set_power_limit)
|
||||
return smu->ppt_funcs->set_power_limit(smu, limit_type, limit);
|
||||
|
||||
|
@@ -27,7 +27,7 @@ that don't know they need it.
|
||||
bool
|
||||
--- a/mm/vmscan.c
|
||||
+++ b/mm/vmscan.c
|
||||
@@ -3968,7 +3968,11 @@ static bool lruvec_is_reclaimable(struct
|
||||
@@ -3974,7 +3974,11 @@ static bool lruvec_is_reclaimable(struct
|
||||
}
|
||||
|
||||
/* to protect the working set of the last N jiffies */
|
||||
|
Reference in New Issue
Block a user