drop drm patch after it caused issues in testing.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/queue-6.12/drm-amdgpu-read-back-register-after-written-for-vcn-v4.0.5.patch b/queue-6.12/drm-amdgpu-read-back-register-after-written-for-vcn-v4.0.5.patch
deleted file mode 100644 (file)
index 5554114..0000000
--- a/queue-6.12/drm-amdgpu-read-back-register-after-written-for-vcn-v4.0.5.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From ee7360fc27d6045510f8fe459b5649b2af27811a Mon Sep 17 00:00:00 2001
-From: "David (Ming Qiang) Wu" <David.Wu3@amd.com>
-Date: Mon, 12 May 2025 15:14:43 -0400
-Subject: drm/amdgpu: read back register after written for VCN v4.0.5
-
-From: David (Ming Qiang) Wu <David.Wu3@amd.com>
-
-commit ee7360fc27d6045510f8fe459b5649b2af27811a upstream.
-
-On VCN v4.0.5 there is a race condition where the WPTR is not
-updated after starting from idle when doorbell is used. Adding
-register read-back after written at function end is to ensure
-all register writes are done before they can be used.
-
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12528
-Signed-off-by: David (Ming Qiang) Wu <David.Wu3@amd.com>
-Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
-Tested-by: Mario Limonciello <mario.limonciello@amd.com>
-Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-Reviewed-by: Ruijing Dong <ruijing.dong@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-(cherry picked from commit 07c9db090b86e5211188e1b351303fbc673378cf)
-Cc: stable@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c
-+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c
-@@ -985,6 +985,10 @@ static int vcn_v4_0_5_start_dpg_mode(str
-                       ring->doorbell_index << VCN_RB1_DB_CTRL__OFFSET__SHIFT |
-                       VCN_RB1_DB_CTRL__EN_MASK);
- 
-+      /* Keeping one read-back to ensure all register writes are done, otherwise
-+       * it may introduce race conditions */
-+      RREG32_SOC15(VCN, inst_idx, regVCN_RB1_DB_CTRL);
-+
-       return 0;
- }
- 
-@@ -1169,6 +1173,10 @@ static int vcn_v4_0_5_start(struct amdgp
-               fw_shared->sq.queue_mode &= ~(FW_QUEUE_RING_RESET | FW_QUEUE_DPG_HOLD_OFF);
-       }
- 
-+      /* Keeping one read-back to ensure all register writes are done, otherwise
-+       * it may introduce race conditions */
-+      RREG32_SOC15(VCN, i, regVCN_RB_ENABLE);
-+
-       return 0;
- }
- 

diff --git a/queue-6.12/series b/queue-6.12/series
index 010773f1228206eb90135e1a203ee0dcac1f1edb..9c8707d11b2ea63ba8e2bed559af12f3af355368 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -80,7 +80,6 @@ btrfs-fix-discard-worker-infinite-loop-after-disabling-discard.patch
 btrfs-fix-folio-leak-in-submit_one_async_extent.patch
 btrfs-add-back-warning-for-mount-option-commit-values-exceeding-300.patch
 revert-drm-amd-display-hardware-cursor-changes-color-when-switched-to-software-cursor.patch
-drm-amdgpu-read-back-register-after-written-for-vcn-v4.0.5.patch
 drm-amdgpu-fix-incorrect-mall-size-for-gfx1151.patch
 drm-amdgpu-csa-unmap-use-uninterruptible-lock.patch
 drm-amd-display-correct-the-reply-value-when-aux-write-incomplete.patch

diff --git a/queue-6.14/drm-amdgpu-read-back-register-after-written-for-vcn-v4.0.5.patch b/queue-6.14/drm-amdgpu-read-back-register-after-written-for-vcn-v4.0.5.patch
deleted file mode 100644 (file)
index 850c744..0000000
--- a/queue-6.14/drm-amdgpu-read-back-register-after-written-for-vcn-v4.0.5.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From ee7360fc27d6045510f8fe459b5649b2af27811a Mon Sep 17 00:00:00 2001
-From: "David (Ming Qiang) Wu" <David.Wu3@amd.com>
-Date: Mon, 12 May 2025 15:14:43 -0400
-Subject: drm/amdgpu: read back register after written for VCN v4.0.5
-
-From: David (Ming Qiang) Wu <David.Wu3@amd.com>
-
-commit ee7360fc27d6045510f8fe459b5649b2af27811a upstream.
-
-On VCN v4.0.5 there is a race condition where the WPTR is not
-updated after starting from idle when doorbell is used. Adding
-register read-back after written at function end is to ensure
-all register writes are done before they can be used.
-
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12528
-Signed-off-by: David (Ming Qiang) Wu <David.Wu3@amd.com>
-Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
-Tested-by: Mario Limonciello <mario.limonciello@amd.com>
-Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-Reviewed-by: Ruijing Dong <ruijing.dong@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-(cherry picked from commit 07c9db090b86e5211188e1b351303fbc673378cf)
-Cc: stable@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c
-+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c
-@@ -983,6 +983,10 @@ static int vcn_v4_0_5_start_dpg_mode(str
-                       ring->doorbell_index << VCN_RB1_DB_CTRL__OFFSET__SHIFT |
-                       VCN_RB1_DB_CTRL__EN_MASK);
- 
-+      /* Keeping one read-back to ensure all register writes are done, otherwise
-+       * it may introduce race conditions */
-+      RREG32_SOC15(VCN, inst_idx, regVCN_RB1_DB_CTRL);
-+
-       return 0;
- }
- 
-@@ -1169,6 +1173,10 @@ static int vcn_v4_0_5_start(struct amdgp
-               fw_shared->sq.queue_mode &= ~(FW_QUEUE_RING_RESET | FW_QUEUE_DPG_HOLD_OFF);
-       }
- 
-+      /* Keeping one read-back to ensure all register writes are done, otherwise
-+       * it may introduce race conditions */
-+      RREG32_SOC15(VCN, i, regVCN_RB_ENABLE);
-+
-       return 0;
- }
- 

diff --git a/queue-6.14/series b/queue-6.14/series
index c3204191e1810ff85041c4dd38ad98a97e0b3712..589b14c87f2c7c9e504908762a2f591a3c5bd218 100644 (file)
--- a/queue-6.14/series
+++ b/queue-6.14/series
@@ -77,7 +77,6 @@ btrfs-fix-folio-leak-in-submit_one_async_extent.patch
 btrfs-add-back-warning-for-mount-option-commit-values-exceeding-300.patch
 revert-drm-amd-display-hardware-cursor-changes-color-when-switched-to-software-cursor.patch
 drm-tiny-panel-mipi-dbi-use-drm_client_setup_with_fourcc.patch
-drm-amdgpu-read-back-register-after-written-for-vcn-v4.0.5.patch
 drm-amdgpu-fix-incorrect-mall-size-for-gfx1151.patch
 drm-amdgpu-csa-unmap-use-uninterruptible-lock.patch
 drm-amd-display-correct-the-reply-value-when-aux-write-incomplete.patch