5.15-stable patches

added patches:
	drm-radeon-apply-state-adjust-rules-to-some-additional-hainan-vairants.patch

diff --git a/queue-5.15/drm-radeon-apply-state-adjust-rules-to-some-additional-hainan-vairants.patch b/queue-5.15/drm-radeon-apply-state-adjust-rules-to-some-additional-hainan-vairants.patch
new file mode 100644 (file)
index 0000000..6402af7
--- /dev/null
+++ b/queue-5.15/drm-radeon-apply-state-adjust-rules-to-some-additional-hainan-vairants.patch
@@ -0,0 +1,35 @@
+From 86650ee2241ff84207eaa298ab318533f3c21a38 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Mon, 25 Sep 2023 10:44:06 -0400
+Subject: drm/radeon: apply state adjust rules to some additional HAINAN vairants
+
+From: Alex Deucher <alexander.deucher@amd.com>
+
+commit 86650ee2241ff84207eaa298ab318533f3c21a38 upstream.
+
+They need a similar workaround.
+
+Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/1839
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+(cherry picked from commit 87327658c848f56eac166cb382b57b83bf06c5ac)
+Cc: stable@vger.kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/radeon/si_dpm.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/radeon/si_dpm.c
++++ b/drivers/gpu/drm/radeon/si_dpm.c
+@@ -2959,9 +2959,11 @@ static void si_apply_state_adjust_rules(
+       if (rdev->family == CHIP_HAINAN) {
+               if ((rdev->pdev->revision == 0x81) ||
+                   (rdev->pdev->revision == 0xC3) ||
++                  (rdev->pdev->device == 0x6660) ||
+                   (rdev->pdev->device == 0x6664) ||
+                   (rdev->pdev->device == 0x6665) ||
+-                  (rdev->pdev->device == 0x6667)) {
++                  (rdev->pdev->device == 0x6667) ||
++                  (rdev->pdev->device == 0x666F)) {
+                       max_sclk = 75000;
+               }
+               if ((rdev->pdev->revision == 0xC3) ||

diff --git a/queue-5.15/series b/queue-5.15/series
index 349348a5e5a8796e0e72bf0d810ae6ca74c7a73a..96882381be82d977ec92c5ab3574456e32949ee9 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -210,3 +210,4 @@ serial-8250_pci-add-support-for-the-ax99100.patch
 serial-8250-fix-tx-deadlock-when-using-dma.patch
 serial-8250-add-late-synchronize_irq-to-shutdown-to-handle-dw-uart-busy.patch
 serial-uartlite-fix-pm-runtime-usage-count-underflow-on-probe.patch
+drm-radeon-apply-state-adjust-rules-to-some-additional-hainan-vairants.patch