6.8/6.9: misc-additions: Add a revert patch to allow for 7700/7800XT custom powercap setting. FW still limits upper boundary, and kernel limits lower boundary.

Reverts https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.8.6&id=f1807682de0edbff6c1e46b19642a517d2e15c57
This commit is contained in:
Tk-Glitch
2024-04-13 18:38:32 +02:00
parent f9115d2f14
commit d9efb6e894
2 changed files with 44 additions and 0 deletions

View File

@ -229,3 +229,25 @@ index 8a4c40b4c27e4f..779880c6457553 100644
dm_atomic_plane_attach_color_mgmt_properties(dm, plane); dm_atomic_plane_attach_color_mgmt_properties(dm, plane);
#endif #endif
/* Create (reset) the plane state */ /* Create (reset) the plane state */
From f1807682de0edbff6c1e46b19642a517d2e15c57 Mon Sep 17 00:00:00 2001
From: Tk-Glitch <ti3nou@gmail.com>
Date: Sat, 13 Apr 2024 18:25:35 +0530
Subject: revert "drm/amd/pm: Fetch current power limit from FW"
Fetching FW value prevents power limit modification by the user.
The "out-of-band ways" are unclear.
This fixes 7700/7800 XT custom powercap.
diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index a54663f2e2ab9f..7ffad3eb0a0150 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -2703,7 +2703,6 @@ int smu_get_power_limit(void *handle,
case SMU_PPT_LIMIT_CURRENT:
switch (amdgpu_ip_version(adev, MP1_HWIP, 0)) {
case IP_VERSION(13, 0, 2):
- case IP_VERSION(13, 0, 6):
case IP_VERSION(11, 0, 7):
case IP_VERSION(11, 0, 11):
case IP_VERSION(11, 0, 12):

View File

@ -229,3 +229,25 @@ index 8a4c40b4c27e4f..779880c6457553 100644
dm_atomic_plane_attach_color_mgmt_properties(dm, plane); dm_atomic_plane_attach_color_mgmt_properties(dm, plane);
#endif #endif
/* Create (reset) the plane state */ /* Create (reset) the plane state */
From f1807682de0edbff6c1e46b19642a517d2e15c57 Mon Sep 17 00:00:00 2001
From: Tk-Glitch <ti3nou@gmail.com>
Date: Sat, 13 Apr 2024 18:25:35 +0530
Subject: revert "drm/amd/pm: Fetch current power limit from FW"
Fetching FW value prevents power limit modification by the user.
The "out-of-band ways" are unclear.
This fixes 7700/7800 XT custom powercap.
diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index a54663f2e2ab9f..7ffad3eb0a0150 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -2703,7 +2703,6 @@ int smu_get_power_limit(void *handle,
case SMU_PPT_LIMIT_CURRENT:
switch (amdgpu_ip_version(adev, MP1_HWIP, 0)) {
case IP_VERSION(13, 0, 2):
- case IP_VERSION(13, 0, 6):
case IP_VERSION(11, 0, 7):
case IP_VERSION(11, 0, 11):
case IP_VERSION(11, 0, 12):