6.1-stable patches

added patches:
	drm-amd-fix-initialization-mistake-for-nbio-7.7.0.patch

diff --git a/queue-6.1/drm-amd-fix-initialization-mistake-for-nbio-7.7.0.patch b/queue-6.1/drm-amd-fix-initialization-mistake-for-nbio-7.7.0.patch
new file mode 100644 (file)
index 0000000..cc375e5
--- /dev/null
+++ b/queue-6.1/drm-amd-fix-initialization-mistake-for-nbio-7.7.0.patch
@@ -0,0 +1,40 @@
+From 7013a8268d311fded6c7a6528fc1de82668e75f6 Mon Sep 17 00:00:00 2001
+From: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
+Date: Tue, 12 Nov 2024 10:11:42 -0600
+Subject: drm/amd: Fix initialization mistake for NBIO 7.7.0
+
+From: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
+
+commit 7013a8268d311fded6c7a6528fc1de82668e75f6 upstream.
+
+There is a strapping issue on NBIO 7.7.0 that can lead to spurious PME
+events while in the D0 state.
+
+Co-developed-by: Mario Limonciello <mario.limonciello@amd.com>
+Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
+Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
+Acked-by: Alex Deucher <alexander.deucher@amd.com>
+Link: https://lore.kernel.org/r/20241112161142.28974-1-mario.limonciello@amd.com
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+(cherry picked from commit 447a54a0f79c9a409ceaa17804bdd2e0206397b9)
+Cc: stable@vger.kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c
++++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c
+@@ -247,6 +247,12 @@ static void nbio_v7_7_init_registers(str
+       if (def != data)
+               WREG32_SOC15(NBIO, 0, regBIF0_PCIE_MST_CTRL_3, data);
+ 
++      switch (adev->ip_versions[NBIO_HWIP][0]) {
++      case IP_VERSION(7, 7, 0):
++              data = RREG32_SOC15(NBIO, 0, regRCC_DEV0_EPF5_STRAP4) & ~BIT(23);
++              WREG32_SOC15(NBIO, 0, regRCC_DEV0_EPF5_STRAP4, data);
++              break;
++      }
+ }
+ 
+ static void nbio_v7_7_update_medium_grain_clock_gating(struct amdgpu_device *adev,

diff --git a/queue-6.1/series b/queue-6.1/series
index a587672e5f8323ee831c3ba82da192606c571c9f..17a9e5ae1c5453539b6a21e9067a3907a0373d9c 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -30,3 +30,4 @@ nilfs2-fix-null-ptr-deref-in-block_dirty_buffer-tracepoint.patch
 revert-mmc-dw_mmc-fix-idmac-operation-with-pages-bigger-than-4k.patch
 mmc-sunxi-mmc-fix-a100-compatible-description.patch
 drm-bridge-tc358768-fix-dsi-command-tx.patch
+drm-amd-fix-initialization-mistake-for-nbio-7.7.0.patch