Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Matthew Brost <matthew.brost@intel.com>
To: intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: mika.kuoppala@intel.com, matthew.auld@intel.com,
	thomas.hellstrom@linux.intel.com
Subject: [PATCH v5 7/9] drm/xe: Use ttm_bo_access in xe_vm_snapshot_capture_delayed
Date: Mon, 21 Oct 2024 14:18:33 -0700	[thread overview]
Message-ID: <20241021211835.1675640-8-matthew.brost@intel.com> (raw)
In-Reply-To: <20241021211835.1675640-1-matthew.brost@intel.com>

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>
---
 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 c99380271de6..c8782da3a5c3 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.34.1


  parent reply	other threads:[~2024-10-21 21:18 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-21 21:18 [PATCH v5 0/9] Fix non-contiguous VRAM BO access in Xe Matthew Brost
2024-10-21 21:18 ` [PATCH v5 1/9] drm/xe: Add xe_bo_vm_access Matthew Brost
2024-10-24  8:13   ` Matthew Auld
2024-10-21 21:18 ` [PATCH v5 2/9] drm/ttm: Add ttm_bo_access Matthew Brost
2024-10-22  9:18   ` Mika Kuoppala
2024-10-23 22:34     ` Matthew Brost
2024-10-24  7:42       ` Mika Kuoppala
2024-10-24  9:20   ` Matthew Auld
2024-10-21 21:18 ` [PATCH v5 3/9] drm/xe: Add xe_ttm_access_memory Matthew Brost
2024-10-24  8:52   ` Matthew Auld
2024-10-21 21:18 ` [PATCH v5 4/9] drm/xe: Take PM ref in delayed snapshot capture worker Matthew Brost
2024-10-22 14:35   ` Matthew Auld
2024-10-21 21:18 ` [PATCH v5 5/9] drm/xe: Update xe_ttm_access_memory to use GPU for non-visible access Matthew Brost
2024-10-21 21:45   ` Matthew Brost
2024-10-21 21:18 ` [PATCH v5 6/9] drm/xe/display: Update intel_bo_read_from_page to use ttm_bo_access Matthew Brost
2024-10-22  8:43   ` Matthew Auld
2024-10-22 18:02     ` Matthew Brost
2024-10-21 21:18 ` Matthew Brost [this message]
2024-10-22  8:54   ` [PATCH v5 7/9] drm/xe: Use ttm_bo_access in xe_vm_snapshot_capture_delayed Matthew Auld
2024-10-21 21:18 ` [PATCH v5 8/9] drm/xe: Set XE_BO_FLAG_PINNED in migrate selftest BOs Matthew Brost
2024-10-21 21:18 ` [PATCH v5 9/9] drm/xe: Only allow contiguous BOs to use xe_bo_vmap Matthew Brost
2024-10-21 21:39 ` ✓ CI.Patch_applied: success for Fix non-contiguous VRAM BO access in Xe (rev5) Patchwork
2024-10-21 21:39 ` ✗ CI.checkpatch: warning " Patchwork
2024-10-21 21:40 ` ✓ CI.KUnit: success " Patchwork
2024-10-21 21:52 ` ✓ CI.Build: " Patchwork
2024-10-21 21:54 ` ✓ CI.Hooks: " Patchwork
2024-10-21 21:56 ` ✗ CI.checksparse: warning " Patchwork
2024-10-21 22:21 ` ✓ CI.BAT: success " Patchwork
2024-10-22  4:51 ` ✗ CI.FULL: failure " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241021211835.1675640-8-matthew.brost@intel.com \
    --to=matthew.brost@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=matthew.auld@intel.com \
    --cc=mika.kuoppala@intel.com \
    --cc=thomas.hellstrom@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox