From: Shane Francis <bigbeeshane@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: airlied@linux.ie, bigbeeshane@gmail.com,
alexander.deucher@amd.com, christian.koenig@amd.com
Subject: [PATCH v3 1/3] drm/prime: use length macro when mapping sgl
Date: Wed, 25 Mar 2020 00:24:48 +0000 [thread overview]
Message-ID: <20200325002450.5240-2-bigbeeshane@gmail.com> (raw)
In-Reply-To: <20200325002450.5240-1-bigbeeshane@gmail.com>
As dma_map_sg can reorganize scatter-gather lists in a
way that can cause some later segments to be empty we should
always use the sg_dma_len macro to fetch the actual length.
This could now be 0 and not need to be mapped to a page or
address array
Signed-off-by: Shane Francis <bigbeeshane@gmail.com>
---
drivers/gpu/drm/drm_prime.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
index 86d9b0e45c8c..e4eff5b84597 100644
--- a/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@ -965,12 +965,14 @@ int drm_prime_sg_to_page_addr_arrays(struct sg_table *sgt, struct page **pages,
u32 len, index;
dma_addr_t addr;
+
index = 0;
for_each_sg(sgt->sgl, sg, sgt->nents, count) {
- len = sg->length;
+ len = sg_dma_len(sg);
page = sg_page(sg);
addr = sg_dma_address(sg);
+
while (len > 0) {
if (WARN_ON(index >= max_entries))
return -1;
--
2.26.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-03-25 0:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-25 0:24 [PATCH v3 0/3] AMDGPU / RADEON / DRM Fix mapping of user pages Shane Francis
2020-03-25 0:24 ` Shane Francis [this message]
2020-03-25 7:54 ` [PATCH v3 1/3] drm/prime: use length macro when mapping sgl Christian König
2020-03-25 0:24 ` [PATCH v3 2/3] drm/amdgpu: fix scatter-gather mapping with user pages Shane Francis
2020-03-25 0:24 ` [PATCH v3 3/3] drm/radeon: " Shane Francis
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=20200325002450.5240-2-bigbeeshane@gmail.com \
--to=bigbeeshane@gmail.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=christian.koenig@amd.com \
--cc=dri-devel@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