Drop drm-xe-use-ttm_bo_access-in-xe_vm_snapshot_capture_d.patch

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

diff --git a/queue-6.12/.series.swp b/queue-6.12/.series.swp
new file mode 100644 (file)
index 0000000..79e0e71
Binary files /dev/null and b/queue-6.12/.series.swp differ

diff --git a/queue-6.12/drm-xe-use-ttm_bo_access-in-xe_vm_snapshot_capture_d.patch b/queue-6.12/drm-xe-use-ttm_bo_access-in-xe_vm_snapshot_capture_d.patch
deleted file mode 100644 (file)
index 2d4fac6..0000000
--- a/queue-6.12/drm-xe-use-ttm_bo_access-in-xe_vm_snapshot_capture_d.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 7aad4e92ca3782686571792d117b3ffcfe05c65c Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 26 Nov 2024 09:46:13 -0800
-Subject: drm/xe: Use ttm_bo_access in xe_vm_snapshot_capture_delayed
-
-From: Matthew Brost <matthew.brost@intel.com>
-
-[ Upstream commit 5f7bec831f1f17c354e4307a12cf79b018296975 ]
-
-Non-contiguous mapping of BO in VRAM doesn't work, use ttm_bo_access
-instead.
-
-v2:
- - Fix error handling
-
-Fixes: 0eb2a18a8fad ("drm/xe: Implement VM snapshot support for BO's and userptr")
-Suggested-by: Matthew Auld <matthew.auld@intel.com>
-Signed-off-by: Matthew Brost <matthew.brost@intel.com>
-Reviewed-by: Matthew Auld <matthew.auld@intel.com>
-Link: https://patchwork.freedesktop.org/patch/msgid/20241126174615.2665852-7-matthew.brost@intel.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/xe/xe_vm.c | 17 ++++++-----------
- 1 file changed, 6 insertions(+), 11 deletions(-)
-
-diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
-index c99380271de62..c8782da3a5c38 100644
---- a/drivers/gpu/drm/xe/xe_vm.c
-+++ b/drivers/gpu/drm/xe/xe_vm.c
-@@ -3303,7 +3303,6 @@ void xe_vm_snapshot_capture_delayed(struct xe_vm_snapshot *snap)
- 
-       for (int i = 0; i < snap->num_snaps; i++) {
-               struct xe_bo *bo = snap->snap[i].bo;
--              struct iosys_map src;
-               int err;
- 
-               if (IS_ERR(snap->snap[i].data))
-@@ -3316,16 +3315,12 @@ void xe_vm_snapshot_capture_delayed(struct xe_vm_snapshot *snap)
-               }
- 
-               if (bo) {
--                      xe_bo_lock(bo, false);
--                      err = ttm_bo_vmap(&bo->ttm, &src);
--                      if (!err) {
--                              xe_map_memcpy_from(xe_bo_device(bo),
--                                                 snap->snap[i].data,
--                                                 &src, snap->snap[i].bo_ofs,
--                                                 snap->snap[i].len);
--                              ttm_bo_vunmap(&bo->ttm, &src);
--                      }
--                      xe_bo_unlock(bo);
-+                      err = ttm_bo_access(&bo->ttm, snap->snap[i].bo_ofs,
-+                                          snap->snap[i].data, snap->snap[i].len, 0);
-+                      if (!(err < 0) && err != snap->snap[i].len)
-+                              err = -EIO;
-+                      else if (!(err < 0))
-+                              err = 0;
-               } else {
-                       void __user *userptr = (void __user *)(size_t)snap->snap[i].bo_ofs;
- 
--- 
-2.39.5
-

diff --git a/queue-6.12/series b/queue-6.12/series
index 343a4f615b0289a6364bae8b42b472b7e7b500b4..0e5c44018c6d25d15da2ef402b5a575a8f12dfa0 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -35,7 +35,6 @@ sched-psi-pass-enqueue-dequeue-flags-to-psi-callback.patch
 psi-fix-race-when-task-wakes-up-before-psi_sched_swi.patch
 drm-v3d-fix-performance-counter-source-settings-on-v.patch
 drm-ttm-add-ttm_bo_access.patch
-drm-xe-use-ttm_bo_access-in-xe_vm_snapshot_capture_d.patch
 drm-rockchip-vop2-fix-rk3588-dp-dsi-maxclk-verificat.patch
 drm-msm-dp-set-safe_to_exit_level-before-printing-it.patch
 drm-msm-hdmi-simplify-code-in-pll_get_integloop_gain.patch