From: Matthew Brost <matthew.brost@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: matthew.auld@intel.com
Subject: [PATCH v6 5/8] drm/xe/display: Update intel_bo_read_from_page to use ttm_bo_access
Date: Thu, 31 Oct 2024 11:10:45 -0700 [thread overview]
Message-ID: <20241031181048.2948948-6-matthew.brost@intel.com> (raw)
In-Reply-To: <20241031181048.2948948-1-matthew.brost@intel.com>
Don't open code vmap of a BO, use ttm_bo_access helper which is safe for
non-contiguous BOs and non-visible BOs.
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>
---
drivers/gpu/drm/xe/display/intel_bo.c | 25 +------------------------
1 file changed, 1 insertion(+), 24 deletions(-)
diff --git a/drivers/gpu/drm/xe/display/intel_bo.c b/drivers/gpu/drm/xe/display/intel_bo.c
index 9f54fad0f1c0..43141964f6f2 100644
--- a/drivers/gpu/drm/xe/display/intel_bo.c
+++ b/drivers/gpu/drm/xe/display/intel_bo.c
@@ -40,31 +40,8 @@ int intel_bo_fb_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)
int intel_bo_read_from_page(struct drm_gem_object *obj, u64 offset, void *dst, int size)
{
struct xe_bo *bo = gem_to_xe_bo(obj);
- struct ttm_bo_kmap_obj map;
- void *src;
- bool is_iomem;
- int ret;
- ret = xe_bo_lock(bo, true);
- if (ret)
- return ret;
-
- ret = ttm_bo_kmap(&bo->ttm, offset >> PAGE_SHIFT, 1, &map);
- if (ret)
- goto out_unlock;
-
- offset &= ~PAGE_MASK;
- src = ttm_kmap_obj_virtual(&map, &is_iomem);
- src += offset;
- if (is_iomem)
- memcpy_fromio(dst, (void __iomem *)src, size);
- else
- memcpy(dst, src, size);
-
- ttm_bo_kunmap(&map);
-out_unlock:
- xe_bo_unlock(bo);
- return ret;
+ return ttm_bo_access(&bo->ttm, offset, dst, size, 0);
}
struct intel_frontbuffer *intel_bo_get_frontbuffer(struct drm_gem_object *obj)
--
2.34.1
next prev parent reply other threads:[~2024-10-31 18:10 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-31 18:10 [PATCH v6 0/8] Fix non-contiguous VRAM BO access in Xe Matthew Brost
2024-10-31 18:10 ` [PATCH v6 1/8] drm/xe: Add xe_bo_vm_access Matthew Brost
2024-10-31 18:10 ` [PATCH v6 2/8] drm/ttm: Add ttm_bo_access Matthew Brost
2024-10-31 23:43 ` Matthew Brost
2024-11-04 17:34 ` Rodrigo Vivi
2024-11-04 19:28 ` Christian König
2024-11-04 21:49 ` Matthew Brost
2024-11-05 7:41 ` Christian König
2024-11-05 18:35 ` Matthew Brost
2024-11-06 9:48 ` Christian König
2024-11-06 15:25 ` Matthew Brost
2024-11-06 15:44 ` Christian König
2024-11-06 17:00 ` Matthew Brost
2024-11-07 9:44 ` Christian König
2024-11-11 8:00 ` Joonas Lahtinen
2024-11-11 10:10 ` Simona Vetter
2024-11-11 11:34 ` Christian König
2024-11-11 14:00 ` Joonas Lahtinen
2024-11-11 15:54 ` Christian König
2024-11-11 22:45 ` Matthew Brost
2024-11-12 9:23 ` Christian König
2024-11-12 13:41 ` Joonas Lahtinen
2024-11-12 16:22 ` Thomas Hellström
2024-11-12 16:25 ` Christian König
2024-11-12 16:33 ` Thomas Hellström
2024-11-13 8:37 ` Christian König
2024-11-13 10:44 ` Thomas Hellström
2024-11-13 11:42 ` Christian König
2024-11-15 18:27 ` Matthew Brost
2024-11-25 15:29 ` Matthew Brost
2024-11-25 16:19 ` Christian König
2024-11-25 17:27 ` Matthew Brost
2024-11-26 8:19 ` Christian König
2024-11-26 17:49 ` Matthew Brost
2024-11-27 13:21 ` Christian König
2024-11-12 8:28 ` Simona Vetter
2024-11-12 8:58 ` Christian König
2024-11-12 13:30 ` Joonas Lahtinen
2024-11-11 11:27 ` Christian König
2024-11-04 19:47 ` Christian König
2024-11-04 21:30 ` Matthew Brost
2024-11-04 22:26 ` Rodrigo Vivi
2024-10-31 18:10 ` [PATCH v6 3/8] drm/xe: Add xe_ttm_access_memory Matthew Brost
2024-10-31 18:10 ` [PATCH v6 4/8] drm/xe: Take PM ref in delayed snapshot capture worker Matthew Brost
2024-10-31 18:10 ` Matthew Brost [this message]
2024-10-31 18:10 ` [PATCH v6 6/8] drm/xe: Use ttm_bo_access in xe_vm_snapshot_capture_delayed Matthew Brost
2024-10-31 18:10 ` [PATCH v6 7/8] drm/xe: Set XE_BO_FLAG_PINNED in migrate selftest BOs Matthew Brost
2024-10-31 18:10 ` [PATCH v6 8/8] drm/xe: Only allow contiguous BOs to use xe_bo_vmap Matthew Brost
2024-10-31 18:15 ` ✓ CI.Patch_applied: success for Fix non-contiguous VRAM BO access in Xe (rev6) Patchwork
2024-10-31 18:15 ` ✗ CI.checkpatch: warning " Patchwork
2024-10-31 18:17 ` ✓ CI.KUnit: success " Patchwork
2024-10-31 18:28 ` ✓ CI.Build: " Patchwork
2024-10-31 18:31 ` ✓ CI.Hooks: " Patchwork
2024-10-31 18:32 ` ✗ CI.checksparse: warning " Patchwork
2024-10-31 18:57 ` ✓ CI.BAT: success " Patchwork
2024-10-31 21:27 ` ✗ 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=20241031181048.2948948-6-matthew.brost@intel.com \
--to=matthew.brost@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=matthew.auld@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