drop queue-5.15/drm-amdgpu-sdma5.2-limit-wptr-workaround-to-sdma-5.2.1.patch

broke the build on older kernels

diff --git a/queue-5.15/drm-amdgpu-sdma5.2-limit-wptr-workaround-to-sdma-5.2.1.patch b/queue-5.15/drm-amdgpu-sdma5.2-limit-wptr-workaround-to-sdma-5.2.1.patch
deleted file mode 100644 (file)
index dc1114d..0000000
--- a/queue-5.15/drm-amdgpu-sdma5.2-limit-wptr-workaround-to-sdma-5.2.1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From e3e4bf58bad1576ac732a1429f53e3d4bfb82b4b Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexander.deucher@amd.com>
-Date: Wed, 14 Aug 2024 10:28:24 -0400
-Subject: drm/amdgpu/sdma5.2: limit wptr workaround to sdma 5.2.1
-
-From: Alex Deucher <alexander.deucher@amd.com>
-
-commit e3e4bf58bad1576ac732a1429f53e3d4bfb82b4b upstream.
-
-The workaround seems to cause stability issues on other
-SDMA 5.2.x IPs.
-
-Fixes: a03ebf116303 ("drm/amdgpu/sdma5.2: Update wptr registers as well as doorbell")
-Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3556
-Acked-by: Ruijing Dong <ruijing.dong@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-(cherry picked from commit 2dc3851ef7d9c5439ea8e9623fc36878f3b40649)
-Cc: stable@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c |   18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
---- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
-+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
-@@ -298,14 +298,16 @@ static void sdma_v5_2_ring_set_wptr(stru
-               DRM_DEBUG("calling WDOORBELL64(0x%08x, 0x%016llx)\n",
-                               ring->doorbell_index, ring->wptr << 2);
-               WDOORBELL64(ring->doorbell_index, ring->wptr << 2);
--              /* SDMA seems to miss doorbells sometimes when powergating kicks in.
--               * Updating the wptr directly will wake it. This is only safe because
--               * we disallow gfxoff in begin_use() and then allow it again in end_use().
--               */
--              WREG32(sdma_v5_2_get_reg_offset(adev, ring->me, mmSDMA0_GFX_RB_WPTR),
--                     lower_32_bits(ring->wptr << 2));
--              WREG32(sdma_v5_2_get_reg_offset(adev, ring->me, mmSDMA0_GFX_RB_WPTR_HI),
--                     upper_32_bits(ring->wptr << 2));
-+              if (amdgpu_ip_version(adev, SDMA0_HWIP, 0) == IP_VERSION(5, 2, 1)) {
-+                      /* SDMA seems to miss doorbells sometimes when powergating kicks in.
-+                       * Updating the wptr directly will wake it. This is only safe because
-+                       * we disallow gfxoff in begin_use() and then allow it again in end_use().
-+                       */
-+                      WREG32(sdma_v5_2_get_reg_offset(adev, ring->me, mmSDMA0_GFX_RB_WPTR),
-+                             lower_32_bits(ring->wptr << 2));
-+                      WREG32(sdma_v5_2_get_reg_offset(adev, ring->me, mmSDMA0_GFX_RB_WPTR_HI),
-+                             upper_32_bits(ring->wptr << 2));
-+              }
-       } else {
-               DRM_DEBUG("Not using doorbell -- "
-                               "mmSDMA%i_GFX_RB_WPTR == 0x%08x "

diff --git a/queue-5.15/series b/queue-5.15/series
index 973ed881d5cad65883ce096b3d2d65954733336d..8b4763726f60261220ea44822e021d8780450046 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -158,7 +158,6 @@ drm-msm-dpu-cleanup-fb-if-dpu_format_populate_layout.patch
 mmc-mmc_test-fix-null-dereference-on-allocation-fail.patch
 bluetooth-mgmt-add-error-handling-to-pair_device.patch
 scsi-core-fix-the-return-value-of-scsi_logical_block_count.patch
-drm-amdgpu-sdma5.2-limit-wptr-workaround-to-sdma-5.2.1.patch
 mips-loongson64-set-timer-mode-in-cpu-probe.patch
 hid-wacom-defer-calculation-of-resolution-until-resolution_code-is-known.patch
 hid-microsoft-add-rumble-support-to-latest-xbox-controllers.patch

diff --git a/queue-6.1/drm-amdgpu-sdma5.2-limit-wptr-workaround-to-sdma-5.2.1.patch b/queue-6.1/drm-amdgpu-sdma5.2-limit-wptr-workaround-to-sdma-5.2.1.patch
deleted file mode 100644 (file)
index 3a991bc..0000000
--- a/queue-6.1/drm-amdgpu-sdma5.2-limit-wptr-workaround-to-sdma-5.2.1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From e3e4bf58bad1576ac732a1429f53e3d4bfb82b4b Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexander.deucher@amd.com>
-Date: Wed, 14 Aug 2024 10:28:24 -0400
-Subject: drm/amdgpu/sdma5.2: limit wptr workaround to sdma 5.2.1
-
-From: Alex Deucher <alexander.deucher@amd.com>
-
-commit e3e4bf58bad1576ac732a1429f53e3d4bfb82b4b upstream.
-
-The workaround seems to cause stability issues on other
-SDMA 5.2.x IPs.
-
-Fixes: a03ebf116303 ("drm/amdgpu/sdma5.2: Update wptr registers as well as doorbell")
-Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3556
-Acked-by: Ruijing Dong <ruijing.dong@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-(cherry picked from commit 2dc3851ef7d9c5439ea8e9623fc36878f3b40649)
-Cc: stable@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c |   18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
---- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
-+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
-@@ -241,14 +241,16 @@ static void sdma_v5_2_ring_set_wptr(stru
-               DRM_DEBUG("calling WDOORBELL64(0x%08x, 0x%016llx)\n",
-                               ring->doorbell_index, ring->wptr << 2);
-               WDOORBELL64(ring->doorbell_index, ring->wptr << 2);
--              /* SDMA seems to miss doorbells sometimes when powergating kicks in.
--               * Updating the wptr directly will wake it. This is only safe because
--               * we disallow gfxoff in begin_use() and then allow it again in end_use().
--               */
--              WREG32(sdma_v5_2_get_reg_offset(adev, ring->me, mmSDMA0_GFX_RB_WPTR),
--                     lower_32_bits(ring->wptr << 2));
--              WREG32(sdma_v5_2_get_reg_offset(adev, ring->me, mmSDMA0_GFX_RB_WPTR_HI),
--                     upper_32_bits(ring->wptr << 2));
-+              if (amdgpu_ip_version(adev, SDMA0_HWIP, 0) == IP_VERSION(5, 2, 1)) {
-+                      /* SDMA seems to miss doorbells sometimes when powergating kicks in.
-+                       * Updating the wptr directly will wake it. This is only safe because
-+                       * we disallow gfxoff in begin_use() and then allow it again in end_use().
-+                       */
-+                      WREG32(sdma_v5_2_get_reg_offset(adev, ring->me, mmSDMA0_GFX_RB_WPTR),
-+                             lower_32_bits(ring->wptr << 2));
-+                      WREG32(sdma_v5_2_get_reg_offset(adev, ring->me, mmSDMA0_GFX_RB_WPTR_HI),
-+                             upper_32_bits(ring->wptr << 2));
-+              }
-       } else {
-               DRM_DEBUG("Not using doorbell -- "
-                               "mmSDMA%i_GFX_RB_WPTR == 0x%08x "

diff --git a/queue-6.1/series b/queue-6.1/series
index 8cf4b2139cf80add8ea97438c6f7821bc2ec0488..91cdaa67715a361e693e3bca33e4388d655ae549 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -265,7 +265,6 @@ bluetooth-mgmt-add-error-handling-to-pair_device.patch
 scsi-core-fix-the-return-value-of-scsi_logical_block_count.patch
 ksmbd-the-buffer-of-smb2-query-dir-response-has-at-least-1-byte.patch
 drm-amdgpu-validate-ta-binary-size.patch
-drm-amdgpu-sdma5.2-limit-wptr-workaround-to-sdma-5.2.1.patch
 mips-loongson64-set-timer-mode-in-cpu-probe.patch
 hid-wacom-defer-calculation-of-resolution-until-resolution_code-is-known.patch
 hid-microsoft-add-rumble-support-to-latest-xbox-controllers.patch

diff --git a/queue-6.6/drm-amdgpu-sdma5.2-limit-wptr-workaround-to-sdma-5.2.1.patch b/queue-6.6/drm-amdgpu-sdma5.2-limit-wptr-workaround-to-sdma-5.2.1.patch
deleted file mode 100644 (file)
index cc253d0..0000000
--- a/queue-6.6/drm-amdgpu-sdma5.2-limit-wptr-workaround-to-sdma-5.2.1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From e3e4bf58bad1576ac732a1429f53e3d4bfb82b4b Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexander.deucher@amd.com>
-Date: Wed, 14 Aug 2024 10:28:24 -0400
-Subject: drm/amdgpu/sdma5.2: limit wptr workaround to sdma 5.2.1
-
-From: Alex Deucher <alexander.deucher@amd.com>
-
-commit e3e4bf58bad1576ac732a1429f53e3d4bfb82b4b upstream.
-
-The workaround seems to cause stability issues on other
-SDMA 5.2.x IPs.
-
-Fixes: a03ebf116303 ("drm/amdgpu/sdma5.2: Update wptr registers as well as doorbell")
-Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3556
-Acked-by: Ruijing Dong <ruijing.dong@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-(cherry picked from commit 2dc3851ef7d9c5439ea8e9623fc36878f3b40649)
-Cc: stable@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c |   18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
---- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
-+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
-@@ -188,14 +188,16 @@ static void sdma_v5_2_ring_set_wptr(stru
-               DRM_DEBUG("calling WDOORBELL64(0x%08x, 0x%016llx)\n",
-                               ring->doorbell_index, ring->wptr << 2);
-               WDOORBELL64(ring->doorbell_index, ring->wptr << 2);
--              /* SDMA seems to miss doorbells sometimes when powergating kicks in.
--               * Updating the wptr directly will wake it. This is only safe because
--               * we disallow gfxoff in begin_use() and then allow it again in end_use().
--               */
--              WREG32(sdma_v5_2_get_reg_offset(adev, ring->me, mmSDMA0_GFX_RB_WPTR),
--                     lower_32_bits(ring->wptr << 2));
--              WREG32(sdma_v5_2_get_reg_offset(adev, ring->me, mmSDMA0_GFX_RB_WPTR_HI),
--                     upper_32_bits(ring->wptr << 2));
-+              if (amdgpu_ip_version(adev, SDMA0_HWIP, 0) == IP_VERSION(5, 2, 1)) {
-+                      /* SDMA seems to miss doorbells sometimes when powergating kicks in.
-+                       * Updating the wptr directly will wake it. This is only safe because
-+                       * we disallow gfxoff in begin_use() and then allow it again in end_use().
-+                       */
-+                      WREG32(sdma_v5_2_get_reg_offset(adev, ring->me, mmSDMA0_GFX_RB_WPTR),
-+                             lower_32_bits(ring->wptr << 2));
-+                      WREG32(sdma_v5_2_get_reg_offset(adev, ring->me, mmSDMA0_GFX_RB_WPTR_HI),
-+                             upper_32_bits(ring->wptr << 2));
-+              }
-       } else {
-               DRM_DEBUG("Not using doorbell -- "
-                               "mmSDMA%i_GFX_RB_WPTR == 0x%08x "

diff --git a/queue-6.6/series b/queue-6.6/series
index 5320465210039f00d04d1f7faf30428b5453b23d..a86484b21a149b41e1b2cbda40dec1d6f0e154e1 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -295,7 +295,6 @@ bluetooth-mgmt-add-error-handling-to-pair_device.patch
 scsi-core-fix-the-return-value-of-scsi_logical_block_count.patch
 ksmbd-the-buffer-of-smb2-query-dir-response-has-at-least-1-byte.patch
 drm-amdgpu-validate-ta-binary-size.patch
-drm-amdgpu-sdma5.2-limit-wptr-workaround-to-sdma-5.2.1.patch
 net-dsa-microchip-fix-ptp-config-failure-when-using-multiple-ports.patch
 mips-loongson64-set-timer-mode-in-cpu-probe.patch
 hid-wacom-defer-calculation-of-resolution-until-resolution_code-is-known.patch