From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> Subject: [PATCH v2 03/15] drm/i915: Fix i915_sg_page_sizes to record dma segments rather than physical pages Date: Tue, 18 May 2021 10:26:49 +0200 [thread overview] Message-ID: <20210518082701.997251-4-thomas.hellstrom@linux.intel.com> (raw) In-Reply-To: <20210518082701.997251-1-thomas.hellstrom@linux.intel.com> All users of this function actually want the dma segment sizes, but that's not what's calculated. Fix that and rename the function to i915_sg_dma_sizes to reflect what's calculated. Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> --- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_phys.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 2 +- drivers/gpu/drm/i915/i915_scatterlist.h | 16 ++++++++++++---- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c index ccede73c6465..616c3a2f1baf 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c @@ -209,7 +209,7 @@ static int i915_gem_object_get_pages_dmabuf(struct drm_i915_gem_object *obj) if (IS_ERR(pages)) return PTR_ERR(pages); - sg_page_sizes = i915_sg_page_sizes(pages->sgl); + sg_page_sizes = i915_sg_dma_sizes(pages->sgl); __i915_gem_object_set_pages(obj, pages, sg_page_sizes); diff --git a/drivers/gpu/drm/i915/gem/i915_gem_phys.c b/drivers/gpu/drm/i915/gem/i915_gem_phys.c index 81dc2bf59bc3..36f373dc493c 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_phys.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_phys.c @@ -208,7 +208,7 @@ static int i915_gem_object_shmem_to_phys(struct drm_i915_gem_object *obj) err_xfer: if (!IS_ERR_OR_NULL(pages)) { - unsigned int sg_page_sizes = i915_sg_page_sizes(pages->sgl); + unsigned int sg_page_sizes = i915_sg_dma_sizes(pages->sgl); __i915_gem_object_set_pages(obj, pages, sg_page_sizes); } diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c index a657b99ec760..602f0ed983ec 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c @@ -173,7 +173,7 @@ static int i915_gem_userptr_get_pages(struct drm_i915_gem_object *obj) goto err; } - sg_page_sizes = i915_sg_page_sizes(st->sgl); + sg_page_sizes = i915_sg_dma_sizes(st->sgl); __i915_gem_object_set_pages(obj, st, sg_page_sizes); diff --git a/drivers/gpu/drm/i915/i915_scatterlist.h b/drivers/gpu/drm/i915/i915_scatterlist.h index 9cb26a224034..b96baad66a3a 100644 --- a/drivers/gpu/drm/i915/i915_scatterlist.h +++ b/drivers/gpu/drm/i915/i915_scatterlist.h @@ -101,15 +101,23 @@ static inline struct scatterlist *__sg_next(struct scatterlist *sg) (((__iter).curr += PAGE_SIZE) >= (__iter).max) ? \ (__iter) = __sgt_iter(__sg_next((__iter).sgp), false), 0 : 0) -static inline unsigned int i915_sg_page_sizes(struct scatterlist *sg) +/** + * i915_sg_dma_sizes - Record the dma segment sizes of a scatterlist + * @sg: The scatterlist + * + * Return: An unsigned int with segment sizes logically or'ed together. + * A caller can use this information to determine what hardware page table + * entry sizes can be used to map the memory represented by the scatterlist. + */ +static inline unsigned int i915_sg_dma_sizes(struct scatterlist *sg) { unsigned int page_sizes; page_sizes = 0; - while (sg) { + while (sg && sg_dma_len(sg)) { GEM_BUG_ON(sg->offset); - GEM_BUG_ON(!IS_ALIGNED(sg->length, PAGE_SIZE)); - page_sizes |= sg->length; + GEM_BUG_ON(!IS_ALIGNED(sg_dma_len(sg), PAGE_SIZE)); + page_sizes |= sg_dma_len(sg); sg = __sg_next(sg); } -- 2.31.1
WARNING: multiple messages have this Message-ID (diff)
From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> Subject: [Intel-gfx] [PATCH v2 03/15] drm/i915: Fix i915_sg_page_sizes to record dma segments rather than physical pages Date: Tue, 18 May 2021 10:26:49 +0200 [thread overview] Message-ID: <20210518082701.997251-4-thomas.hellstrom@linux.intel.com> (raw) In-Reply-To: <20210518082701.997251-1-thomas.hellstrom@linux.intel.com> All users of this function actually want the dma segment sizes, but that's not what's calculated. Fix that and rename the function to i915_sg_dma_sizes to reflect what's calculated. Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> --- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_phys.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 2 +- drivers/gpu/drm/i915/i915_scatterlist.h | 16 ++++++++++++---- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c index ccede73c6465..616c3a2f1baf 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c @@ -209,7 +209,7 @@ static int i915_gem_object_get_pages_dmabuf(struct drm_i915_gem_object *obj) if (IS_ERR(pages)) return PTR_ERR(pages); - sg_page_sizes = i915_sg_page_sizes(pages->sgl); + sg_page_sizes = i915_sg_dma_sizes(pages->sgl); __i915_gem_object_set_pages(obj, pages, sg_page_sizes); diff --git a/drivers/gpu/drm/i915/gem/i915_gem_phys.c b/drivers/gpu/drm/i915/gem/i915_gem_phys.c index 81dc2bf59bc3..36f373dc493c 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_phys.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_phys.c @@ -208,7 +208,7 @@ static int i915_gem_object_shmem_to_phys(struct drm_i915_gem_object *obj) err_xfer: if (!IS_ERR_OR_NULL(pages)) { - unsigned int sg_page_sizes = i915_sg_page_sizes(pages->sgl); + unsigned int sg_page_sizes = i915_sg_dma_sizes(pages->sgl); __i915_gem_object_set_pages(obj, pages, sg_page_sizes); } diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c index a657b99ec760..602f0ed983ec 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c @@ -173,7 +173,7 @@ static int i915_gem_userptr_get_pages(struct drm_i915_gem_object *obj) goto err; } - sg_page_sizes = i915_sg_page_sizes(st->sgl); + sg_page_sizes = i915_sg_dma_sizes(st->sgl); __i915_gem_object_set_pages(obj, st, sg_page_sizes); diff --git a/drivers/gpu/drm/i915/i915_scatterlist.h b/drivers/gpu/drm/i915/i915_scatterlist.h index 9cb26a224034..b96baad66a3a 100644 --- a/drivers/gpu/drm/i915/i915_scatterlist.h +++ b/drivers/gpu/drm/i915/i915_scatterlist.h @@ -101,15 +101,23 @@ static inline struct scatterlist *__sg_next(struct scatterlist *sg) (((__iter).curr += PAGE_SIZE) >= (__iter).max) ? \ (__iter) = __sgt_iter(__sg_next((__iter).sgp), false), 0 : 0) -static inline unsigned int i915_sg_page_sizes(struct scatterlist *sg) +/** + * i915_sg_dma_sizes - Record the dma segment sizes of a scatterlist + * @sg: The scatterlist + * + * Return: An unsigned int with segment sizes logically or'ed together. + * A caller can use this information to determine what hardware page table + * entry sizes can be used to map the memory represented by the scatterlist. + */ +static inline unsigned int i915_sg_dma_sizes(struct scatterlist *sg) { unsigned int page_sizes; page_sizes = 0; - while (sg) { + while (sg && sg_dma_len(sg)) { GEM_BUG_ON(sg->offset); - GEM_BUG_ON(!IS_ALIGNED(sg->length, PAGE_SIZE)); - page_sizes |= sg->length; + GEM_BUG_ON(!IS_ALIGNED(sg_dma_len(sg), PAGE_SIZE)); + page_sizes |= sg_dma_len(sg); sg = __sg_next(sg); } -- 2.31.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-05-18 8:27 UTC|newest] Thread overview: 120+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-18 8:26 [PATCH v2 00/15] drm/i915: Move LMEM (VRAM) management over to TTM Thomas Hellström 2021-05-18 8:26 ` [Intel-gfx] " Thomas Hellström 2021-05-18 8:26 ` [PATCH v2 01/15] drm/i915: Untangle the vma pages_mutex Thomas Hellström 2021-05-18 8:26 ` [Intel-gfx] " Thomas Hellström 2021-05-18 11:12 ` Maarten Lankhorst 2021-05-18 11:12 ` [Intel-gfx] " Maarten Lankhorst 2021-05-18 11:28 ` Thomas Hellström 2021-05-18 11:28 ` [Intel-gfx] " Thomas Hellström 2021-05-18 8:26 ` [PATCH v2 02/15] drm/i915: Don't free shared locks while shared Thomas Hellström 2021-05-18 8:26 ` [Intel-gfx] " Thomas Hellström 2021-05-18 11:18 ` Maarten Lankhorst 2021-05-18 11:18 ` [Intel-gfx] " Maarten Lankhorst 2021-05-18 11:30 ` Thomas Hellström (Intel) 2021-05-18 11:30 ` Thomas Hellström (Intel) 2021-05-18 8:26 ` Thomas Hellström [this message] 2021-05-18 8:26 ` [Intel-gfx] [PATCH v2 03/15] drm/i915: Fix i915_sg_page_sizes to record dma segments rather than physical pages Thomas Hellström 2021-05-18 8:46 ` Matthew Auld 2021-05-18 8:46 ` Matthew Auld 2021-05-18 8:26 ` [PATCH v2 04/15] drm/ttm: Export functions to initialize and finalize the ttm range manager standalone Thomas Hellström 2021-05-18 8:26 ` [Intel-gfx] " Thomas Hellström 2021-05-18 9:03 ` Daniel Vetter 2021-05-18 9:03 ` [Intel-gfx] " Daniel Vetter 2021-05-18 11:51 ` Christian König 2021-05-18 11:51 ` [Intel-gfx] " Christian König 2021-05-18 13:06 ` Thomas Hellström 2021-05-18 13:06 ` [Intel-gfx] " Thomas Hellström 2021-05-18 13:11 ` Christian König 2021-05-18 13:11 ` [Intel-gfx] " Christian König 2021-05-18 8:26 ` [PATCH v2 05/15] drm/i915/ttm Initialize the ttm device and memory managers Thomas Hellström 2021-05-18 8:26 ` [Intel-gfx] " Thomas Hellström 2021-05-18 9:05 ` Matthew Auld 2021-05-18 9:05 ` Matthew Auld 2021-05-18 9:09 ` Matthew Auld 2021-05-18 9:09 ` Matthew Auld 2021-05-18 9:12 ` Thomas Hellström 2021-05-18 9:12 ` Thomas Hellström 2021-05-18 8:26 ` [PATCH v2 06/15] drm/i915/ttm: Embed a ttm buffer object in the i915 gem object Thomas Hellström 2021-05-18 8:26 ` [Intel-gfx] " Thomas Hellström 2021-05-18 11:44 ` Maarten Lankhorst 2021-05-18 11:44 ` [Intel-gfx] " Maarten Lankhorst 2021-05-18 8:26 ` [PATCH v2 07/15] drm/ttm: Export ttm_bo_tt_destroy() Thomas Hellström 2021-05-18 8:26 ` [Intel-gfx] " Thomas Hellström 2021-05-18 11:46 ` Maarten Lankhorst 2021-05-18 11:46 ` [Intel-gfx] " Maarten Lankhorst 2021-05-18 12:01 ` Christian König 2021-05-18 12:01 ` [Intel-gfx] " Christian König 2021-05-18 8:26 ` [PATCH v2 08/15] drm/i915/ttm Add a generic TTM memcpy move for page-based iomem Thomas Hellström 2021-05-18 8:26 ` [Intel-gfx] " Thomas Hellström 2021-05-18 11:55 ` Christian König 2021-05-18 11:55 ` [Intel-gfx] " Christian König 2021-05-18 12:04 ` Thomas Hellström 2021-05-18 12:04 ` [Intel-gfx] " Thomas Hellström 2021-05-18 12:09 ` Christian König 2021-05-18 12:09 ` [Intel-gfx] " Christian König 2021-05-18 12:52 ` Thomas Hellström 2021-05-18 12:52 ` [Intel-gfx] " Thomas Hellström 2021-05-18 13:08 ` Christian König 2021-05-18 13:08 ` [Intel-gfx] " Christian König 2021-05-18 13:24 ` Thomas Hellström 2021-05-18 13:24 ` [Intel-gfx] " Thomas Hellström 2021-05-18 13:26 ` Christian König 2021-05-18 13:26 ` [Intel-gfx] " Christian König 2021-05-18 8:26 ` [PATCH v2 09/15] drm/ttm, drm/amdgpu: Allow the driver some control over swapping Thomas Hellström 2021-05-18 8:26 ` [Intel-gfx] " Thomas Hellström 2021-05-18 12:19 ` Maarten Lankhorst 2021-05-18 12:19 ` Maarten Lankhorst 2021-05-18 15:15 ` Thomas Hellström 2021-05-18 15:15 ` [Intel-gfx] " Thomas Hellström 2021-05-18 15:18 ` Christian König 2021-05-18 15:18 ` [Intel-gfx] " Christian König 2021-05-18 15:20 ` Thomas Hellström 2021-05-18 15:20 ` [Intel-gfx] " Thomas Hellström 2021-05-18 15:28 ` Christian König 2021-05-18 15:28 ` [Intel-gfx] " Christian König 2021-05-18 15:38 ` Thomas Hellström 2021-05-18 15:38 ` [Intel-gfx] " Thomas Hellström 2021-05-18 15:42 ` Christian König 2021-05-18 15:42 ` [Intel-gfx] " Christian König 2021-05-18 16:07 ` Thomas Hellström 2021-05-18 16:07 ` [Intel-gfx] " Thomas Hellström 2021-05-18 16:30 ` Christian König 2021-05-18 16:30 ` [Intel-gfx] " Christian König 2021-05-19 6:27 ` Thomas Hellström 2021-05-19 6:27 ` [Intel-gfx] " Thomas Hellström 2021-05-19 10:43 ` Christian König 2021-05-19 10:43 ` [Intel-gfx] " Christian König 2021-05-18 8:26 ` [PATCH v2 10/15] drm/i915/ttm: Introduce a TTM i915 gem object backend Thomas Hellström 2021-05-18 8:26 ` [Intel-gfx] " Thomas Hellström 2021-05-19 9:53 ` Matthew Auld 2021-05-19 9:53 ` Matthew Auld 2021-05-19 11:29 ` Thomas Hellström 2021-05-19 11:29 ` Thomas Hellström 2021-05-18 8:26 ` [PATCH v2 11/15] drm/i915/lmem: Verify checks for lmem residency Thomas Hellström 2021-05-18 8:26 ` [Intel-gfx] " Thomas Hellström 2021-05-19 10:04 ` Matthew Auld 2021-05-19 10:04 ` Matthew Auld 2021-05-18 8:26 ` [PATCH v2 12/15] drm/i915: Disable mmap ioctl for gen12+ Thomas Hellström 2021-05-18 8:26 ` [Intel-gfx] " Thomas Hellström 2021-05-18 8:41 ` Thomas Hellström 2021-05-18 8:41 ` Thomas Hellström 2021-05-18 8:26 ` [PATCH v2 13/15] drm/ttm: Add BO and offset arguments for vm_access and vm_fault ttm handlers Thomas Hellström 2021-05-18 8:26 ` [Intel-gfx] " Thomas Hellström 2021-05-18 8:59 ` Thomas Hellström 2021-05-18 8:59 ` Thomas Hellström 2021-05-18 11:59 ` Christian König 2021-05-18 11:59 ` Christian König 2021-05-18 14:59 ` Thomas Hellström 2021-05-18 14:59 ` Thomas Hellström 2021-05-18 8:27 ` [PATCH v2 14/15] drm/i915: Use ttm mmap handling for ttm bo's Thomas Hellström 2021-05-18 8:27 ` [Intel-gfx] " Thomas Hellström 2021-05-18 9:17 ` Thomas Hellström 2021-05-18 9:17 ` Thomas Hellström 2021-05-18 8:27 ` [PATCH v2 15/15] drm/i915/ttm: Add io sgt caching to i915_ttm_io_mem_pfn Thomas Hellström 2021-05-18 8:27 ` [Intel-gfx] " Thomas Hellström 2021-05-18 9:33 ` Thomas Hellström 2021-05-18 9:33 ` Thomas Hellström 2021-05-18 8:44 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Move LMEM (VRAM) management over to TTM (rev2) Patchwork 2021-05-18 8:47 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2021-05-18 9:14 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork 2021-05-18 17:02 ` [Intel-gfx] ✓ Fi.CI.IGT: success " 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=20210518082701.997251-4-thomas.hellstrom@linux.intel.com \ --to=thomas.hellstrom@linux.intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.