Drop queue-5.15/drm-vmwgfx-add-seqno-waiter-for-sync_files.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.15/drm-vmwgfx-add-seqno-waiter-for-sync_files.patch b/queue-5.15/drm-vmwgfx-add-seqno-waiter-for-sync_files.patch
deleted file mode 100644 (file)
index 3a97f58..0000000
--- a/queue-5.15/drm-vmwgfx-add-seqno-waiter-for-sync_files.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 457416bd809b30bbb22d71173521e8f1fe1c2638 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 28 Feb 2025 14:06:33 -0600
-Subject: drm/vmwgfx: Add seqno waiter for sync_files
-
-From: Ian Forbes <ian.forbes@broadcom.com>
-
-[ Upstream commit 0039a3b35b10d9c15d3d26320532ab56cc566750 ]
-
-Because sync_files are passive waiters they do not participate in
-the processing of fences like the traditional vmw_fence_wait IOCTL.
-If userspace exclusively uses sync_files for synchronization then
-nothing in the kernel actually processes fence updates as interrupts
-for fences are masked and ignored if the kernel does not indicate to the
-SVGA device that there are active waiters.
-
-This oversight results in a bug where the entire GUI can freeze waiting
-on a sync_file that will never be signalled as we've masked the interrupts
-to signal its completion. This bug is incredibly racy as any process which
-interacts with the fencing code via the 3D stack can process the stuck
-fences on behalf of the stuck process causing it to run again. Even a
-simple app like eglinfo is enough to resume the stuck process. Usually
-this bug is seen at a login screen like GDM because there are no other
-3D apps running.
-
-By adding a seqno waiter we re-enable interrupt based processing of the
-dma_fences associated with the sync_file which is signalled as part of a
-dma_fence_callback.
-
-This has likely been broken since it was initially added to the kernel in
-2017 but has gone unnoticed until mutter recently started using sync_files
-heavily over the course of 2024 as part of their explicit sync support.
-
-Fixes: c906965dee22 ("drm/vmwgfx: Add export fence to file descriptor support")
-Signed-off-by: Ian Forbes <ian.forbes@broadcom.com>
-Signed-off-by: Zack Rusin <zack.rusin@broadcom.com>
-Link: https://patchwork.freedesktop.org/patch/msgid/20250228200633.642417-1-ian.forbes@broadcom.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 26 +++++++++++++++++++++++++
- 1 file changed, 26 insertions(+)
-
-diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
-index 21134c7f18382..d25d30078343b 100644
---- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
-+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
-@@ -4032,6 +4032,23 @@ static int vmw_execbuf_tie_context(struct vmw_private *dev_priv,
-       return 0;
- }
- 
-+/*
-+ * DMA fence callback to remove a seqno_waiter
-+ */
-+struct seqno_waiter_rm_context {
-+      struct dma_fence_cb base;
-+      struct vmw_private *dev_priv;
-+};
-+
-+static void seqno_waiter_rm_cb(struct dma_fence *f, struct dma_fence_cb *cb)
-+{
-+      struct seqno_waiter_rm_context *ctx =
-+              container_of(cb, struct seqno_waiter_rm_context, base);
-+
-+      vmw_seqno_waiter_remove(ctx->dev_priv);
-+      kfree(ctx);
-+}
-+
- int vmw_execbuf_process(struct drm_file *file_priv,
-                       struct vmw_private *dev_priv,
-                       void __user *user_commands, void *kernel_commands,
-@@ -4221,6 +4238,15 @@ int vmw_execbuf_process(struct drm_file *file_priv,
-               } else {
-                       /* Link the fence with the FD created earlier */
-                       fd_install(out_fence_fd, sync_file->file);
-+                      struct seqno_waiter_rm_context *ctx =
-+                              kmalloc(sizeof(*ctx), GFP_KERNEL);
-+                      ctx->dev_priv = dev_priv;
-+                      vmw_seqno_waiter_add(dev_priv);
-+                      if (dma_fence_add_callback(&fence->base, &ctx->base,
-+                                                 seqno_waiter_rm_cb) < 0) {
-+                              vmw_seqno_waiter_remove(dev_priv);
-+                              kfree(ctx);
-+                      }
-               }
-       }
- 
--- 
-2.39.5
-

diff --git a/queue-5.15/series b/queue-5.15/series
index a2d4a311df449068318a92ab64058bf22401cdcb..64cc0ca8c232a074701640978cee5046a71adc7a 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -24,7 +24,6 @@ pm-wakeup-delete-space-in-the-end-of-string-shown-by.patch
 x86-mtrr-check-if-fixed-range-mtrrs-exist-in-mtrr_sa.patch
 acpi-osi-stop-advertising-support-for-3.0-_scp-exten.patch
 spi-sh-msiof-fix-maximum-dma-transfer-size.patch
-drm-vmwgfx-add-seqno-waiter-for-sync_files.patch
 drm-amd-pp-fix-potential-null-pointer-dereference-in.patch
 media-rkvdec-fix-frame-size-enumeration.patch
 fs-ntfs3-handle-hdr_first_de-return-value.patch