Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Oak Zeng <oak.zeng@intel.com>
To: intel-xe@lists.freedesktop.org
Subject: [CI 24/43] drm/xe: Add dma_addr res cursor
Date: Tue, 11 Jun 2024 22:25:46 -0400	[thread overview]
Message-ID: <20240612022605.385062-24-oak.zeng@intel.com> (raw)
In-Reply-To: <20240612022605.385062-1-oak.zeng@intel.com>

From: Matthew Brost <matthew.brost@intel.com>

Signed-off-by: Matthew Brost <matthew.brost@intel.com>
---
 drivers/gpu/drm/xe/xe_res_cursor.h | 50 +++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/xe/xe_res_cursor.h b/drivers/gpu/drm/xe/xe_res_cursor.h
index 655af89b31a9..b17b3375f6d9 100644
--- a/drivers/gpu/drm/xe/xe_res_cursor.h
+++ b/drivers/gpu/drm/xe/xe_res_cursor.h
@@ -44,7 +44,9 @@ struct xe_res_cursor {
 	u64 remaining;
 	void *node;
 	u32 mem_type;
+	unsigned int order;
 	struct scatterlist *sgl;
+	const dma_addr_t *dma_addr;
 	struct drm_buddy *mm;
 };
 
@@ -71,6 +73,7 @@ static inline void xe_res_first(struct ttm_resource *res,
 				struct xe_res_cursor *cur)
 {
 	cur->sgl = NULL;
+	cur->dma_addr = NULL;
 	if (!res)
 		goto fallback;
 
@@ -161,11 +164,43 @@ static inline void xe_res_first_sg(const struct sg_table *sg,
 	cur->start = start;
 	cur->remaining = size;
 	cur->size = 0;
+	cur->dma_addr = NULL;
 	cur->sgl = sg->sgl;
 	cur->mem_type = XE_PL_TT;
 	__xe_res_sg_next(cur);
 }
 
+/**
+ * xe_res_first_dma - initialize a xe_res_cursor with dma_addr array
+ *
+ * @dma_addr: dma_addr array to walk
+ * @start: Start of the range
+ * @size: Size of the range
+ * @order: Order of dma mapping. i.e. PAGE_SIZE << order is mapping size
+ * @cur: cursor object to initialize
+ *
+ * Start walking over the range of allocations between @start and @size.
+ */
+static inline void xe_res_first_dma(const dma_addr_t *dma_addr,
+				    u64 start, u64 size,
+				    unsigned int order,
+				    struct xe_res_cursor *cur)
+{
+	XE_WARN_ON(start);
+	XE_WARN_ON(!dma_addr);
+	XE_WARN_ON(!IS_ALIGNED(start, PAGE_SIZE) ||
+		   !IS_ALIGNED(size, PAGE_SIZE));
+
+	cur->node = NULL;
+	cur->start = start;
+	cur->remaining = size;
+	cur->size = PAGE_SIZE << order;
+	cur->dma_addr = dma_addr;
+	cur->order = order;
+	cur->sgl = NULL;
+	cur->mem_type = XE_PL_TT;
+}
+
 /**
  * xe_res_next - advance the cursor
  *
@@ -192,6 +227,13 @@ static inline void xe_res_next(struct xe_res_cursor *cur, u64 size)
 		return;
 	}
 
+	if (cur->dma_addr) {
+		cur->size = (PAGE_SIZE << cur->order) -
+			(size - cur->size);
+		cur->start += size;
+		return;
+	}
+
 	if (cur->sgl) {
 		cur->start += size;
 		__xe_res_sg_next(cur);
@@ -233,6 +275,12 @@ static inline void xe_res_next(struct xe_res_cursor *cur, u64 size)
  */
 static inline u64 xe_res_dma(const struct xe_res_cursor *cur)
 {
-	return cur->sgl ? sg_dma_address(cur->sgl) + cur->start : cur->start;
+	if (cur->dma_addr)
+		return cur->dma_addr[cur->start >> (PAGE_SHIFT + cur->order)] +
+			(cur->start & ((PAGE_SIZE << cur->order) - 1));
+	else if (cur->sgl)
+		return sg_dma_address(cur->sgl) + cur->start;
+	else
+		return cur->start;
 }
 #endif
-- 
2.26.3


  parent reply	other threads:[~2024-06-12  2:16 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-12  2:25 [CI 01/43] mm/hmm: let users to tag specific PFNs Oak Zeng
2024-06-12  2:25 ` [CI 02/43] dma-mapping: provide an interface to allocate IOVA Oak Zeng
2024-06-12  2:25 ` [CI 03/43] dma-mapping: provide callbacks to link/unlink pages to specific IOVA Oak Zeng
2024-06-12  2:25 ` [CI 04/43] iommu/dma: Provide an interface to allow preallocate IOVA Oak Zeng
2024-06-12  2:25 ` [CI 05/43] iommu/dma: Prepare map/unmap page functions to receive IOVA Oak Zeng
2024-06-12  2:25 ` [CI 06/43] iommu/dma: Implement link/unlink page callbacks Oak Zeng
2024-06-12  2:25 ` [CI 07/43] drm: move xe_sg_segment_size to drm layer Oak Zeng
2024-06-12  2:25 ` [CI 08/43] drm: Move GPUVA_START/LAST to drm_gpuvm.h Oak Zeng
2024-06-12  2:25 ` [CI 09/43] drm/svm: Mark drm_gpuvm to participate SVM Oak Zeng
2024-06-12  2:25 ` [CI 10/43] drm/svm: introduce drm_mem_region concept Oak Zeng
2024-06-12  2:25 ` [CI 11/43] drm/svm: introduce hmmptr and helper functions Oak Zeng
2024-06-12  2:25 ` [CI 12/43] drm/svm: Introduce helper to remap drm memory region Oak Zeng
2024-06-12  2:25 ` [CI 13/43] drm/svm: handle CPU page fault Oak Zeng
2024-06-12  2:25 ` [CI 14/43] drm/svm: Migrate a range of hmmptr to vram Oak Zeng
2024-06-12  2:25 ` [CI 15/43] drm/svm: Add DRM SVM documentation Oak Zeng
2024-06-12  2:25 ` [CI 16/43] drm/xe: s/xe_tile_migrate_engine/xe_tile_migrate_exec_queue Oak Zeng
2024-06-12  2:25 ` [CI 17/43] drm/xe: Add xe_vm_pgtable_update_op to xe_vma_ops Oak Zeng
2024-06-12  2:25 ` [CI 18/43] drm/xe: Convert multiple bind ops into single job Oak Zeng
2024-06-12  2:25 ` [CI 19/43] drm/xe: Update VM trace events Oak Zeng
2024-06-12  2:25 ` [CI 20/43] drm/xe: Update PT layer with better error handling Oak Zeng
2024-06-12  2:25 ` [CI 21/43] drm/xe: Retry BO allocation Oak Zeng
2024-06-12  2:25 ` [CI 22/43] drm/xe/uapi: Add DRM_XE_VM_BIND_FLAG_SYSTEM_ALLOCATOR flag Oak Zeng
2024-06-12  2:25 ` [CI 23/43] drm/xe: Add a helper to calculate userptr end address Oak Zeng
2024-06-12  2:25 ` Oak Zeng [this message]
2024-06-12  2:25 ` [CI 25/43] drm/xe: Use drm_mem_region for xe Oak Zeng
2024-06-12  2:25 ` [CI 26/43] drm/xe: use drm_hmmptr in xe Oak Zeng
2024-06-12  2:25 ` [CI 27/43] drm/xe: Moving to range based vma invalidation Oak Zeng
2024-06-12  2:25 ` [CI 28/43] drm/xe: Support range based page table update Oak Zeng
2024-06-12  2:25 ` [CI 29/43] drm/xe/uapi: Add DRM_XE_VM_CREATE_FLAG_PARTICIPATE_SVM flag Oak Zeng
2024-06-12  2:25 ` [CI 30/43] drm/xe/svm: Create userptr if page fault occurs on system_allocator VMA Oak Zeng
2024-06-12  2:25 ` [CI 31/43] drm/xe/svm: Add faulted userptr VMA garbage collector Oak Zeng
2024-06-12  2:25 ` [CI 32/43] drm/xe: Introduce helper to get tile from memory region Oak Zeng
2024-06-12  2:25 ` [CI 33/43] drm/xe/svm: implement functions to allocate and free device memory Oak Zeng
2024-06-12  2:25 ` [CI 34/43] drm/xe/svm: Get drm device from drm memory region Oak Zeng
2024-06-12  2:25 ` [CI 35/43] drm/xe/svm: Get page map owner of a " Oak Zeng
2024-06-12  2:25 ` [CI 36/43] drm/xe/svm: Add migrate layer functions for SVM support Oak Zeng
2024-06-12  2:25 ` [CI 37/43] drm/xe/svm: introduce svm migration function Oak Zeng
2024-06-12  2:26 ` [CI 38/43] drm/xe/svm: Register xe memory region to drm layer Oak Zeng
2024-06-12  2:26 ` [CI 39/43] drm/xe/svm: Introduce DRM_XE_SVM kernel config Oak Zeng
2024-06-12  2:26 ` [CI 40/43] drm/xe/svm: Migration from sram to vram for system allocator Oak Zeng
2024-06-12  2:26 ` [CI 41/43] drm/xe/svm: Determine a vma is backed by device memory Oak Zeng
2024-06-12  2:26 ` [CI 42/43] drm/xe/svm: Introduce hmm_pfn array based resource cursor Oak Zeng
2024-06-12  2:26 ` [CI 43/43] drm/xe: Enable system allocator uAPI Oak Zeng
2024-06-12  3:14 ` ✓ CI.Patch_applied: success for series starting with [CI,01/43] mm/hmm: let users to tag specific PFNs Patchwork
2024-06-12  3:15 ` ✗ CI.checkpatch: warning " Patchwork
2024-06-12  3:16 ` ✗ CI.KUnit: 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=20240612022605.385062-24-oak.zeng@intel.com \
    --to=oak.zeng@intel.com \
    --cc=intel-xe@lists.freedesktop.org \
    /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