From a42fae27971b32a0e138e24916c2e907a0abb031 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Mon, 3 Feb 2025 07:48:13 -0500 Subject: [PATCH] Drop drm-xe-use-ttm_bo_access-in-xe_vm_snapshot_capture_d.patch Signed-off-by: Sasha Levin --- queue-6.12/.series.swp | Bin 0 -> 16384 bytes ...o_access-in-xe_vm_snapshot_capture_d.patch | 63 ------------------ queue-6.12/series | 1 - 3 files changed, 64 deletions(-) create mode 100644 queue-6.12/.series.swp delete mode 100644 queue-6.12/drm-xe-use-ttm_bo_access-in-xe_vm_snapshot_capture_d.patch diff --git a/queue-6.12/.series.swp b/queue-6.12/.series.swp new file mode 100644 index 0000000000000000000000000000000000000000..79e0e7191897a6220a5d8ead744a339efe34b4a9 GIT binary patch literal 16384 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 literal 0 Hc-jL100001 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 index 2d4fac642f..0000000000 --- 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 -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 - -[ 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 -Signed-off-by: Matthew Brost -Reviewed-by: Matthew Auld -Link: https://patchwork.freedesktop.org/patch/msgid/20241126174615.2665852-7-matthew.brost@intel.com -Signed-off-by: Sasha Levin ---- - 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 343a4f615b..0e5c44018c 100644 --- 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 -- 2.47.3