5.4-stable patches

added patches:
	drm-amdgpu-fix-xclk-freq-on-chip_stoney.patch

diff --git a/queue-5.4/drm-amdgpu-fix-xclk-freq-on-chip_stoney.patch b/queue-5.4/drm-amdgpu-fix-xclk-freq-on-chip_stoney.patch
new file mode 100644 (file)
index 0000000..1e9bf83
--- /dev/null
+++ b/queue-5.4/drm-amdgpu-fix-xclk-freq-on-chip_stoney.patch
@@ -0,0 +1,41 @@
+From b447b079cf3a9971ea4d31301e673f49612ccc18 Mon Sep 17 00:00:00 2001
+From: Chia-I Wu <olvaffe@gmail.com>
+Date: Thu, 1 Jun 2023 14:48:08 -0700
+Subject: drm/amdgpu: fix xclk freq on CHIP_STONEY
+
+From: Chia-I Wu <olvaffe@gmail.com>
+
+commit b447b079cf3a9971ea4d31301e673f49612ccc18 upstream.
+
+According to Alex, most APUs from that time seem to have the same issue
+(vbios says 48Mhz, actual is 100Mhz).  I only have a CHIP_STONEY so I
+limit the fixup to CHIP_STONEY
+
+Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Cc: stable@vger.kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/amdgpu/vi.c |   11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/amd/amdgpu/vi.c
++++ b/drivers/gpu/drm/amd/amdgpu/vi.c
+@@ -329,8 +329,15 @@ static u32 vi_get_xclk(struct amdgpu_dev
+       u32 reference_clock = adev->clock.spll.reference_freq;
+       u32 tmp;
+ 
+-      if (adev->flags & AMD_IS_APU)
+-              return reference_clock;
++      if (adev->flags & AMD_IS_APU) {
++              switch (adev->asic_type) {
++              case CHIP_STONEY:
++                      /* vbios says 48Mhz, but the actual freq is 100Mhz */
++                      return 10000;
++              default:
++                      return reference_clock;
++              }
++      }
+ 
+       tmp = RREG32_SMC(ixCG_CLKPIN_CNTL_2);
+       if (REG_GET_FIELD(tmp, CG_CLKPIN_CNTL_2, MUX_TCLK_TO_XCLK))

diff --git a/queue-5.4/series b/queue-5.4/series
index 74eb1ba36be8f9156bc826f578776eb48c384685..d8300e43b6a28b1892ae5af846697b1c3716579f 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -21,3 +21,4 @@ input-xpad-delete-a-razer-deathadder-mouse-vid-pid-entry.patch
 input-psmouse-fix-oob-access-in-elantech-protocol.patch
 alsa-hda-realtek-add-a-quirk-for-hp-slim-desktop-s01.patch
 alsa-hda-realtek-add-lenovo-p3-tower-platform.patch
+drm-amdgpu-fix-xclk-freq-on-chip_stoney.patch