From: Shane Francis <bigbeeshane@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: bigbeeshane@gmail.com
Subject: [PATCH v2 3/3] drm/radeon: fix scatter-gather mapping with user pages
Date: Mon, 23 Mar 2020 23:51:38 +0000 [thread overview]
Message-ID: <20200323235138.207442-4-bigbeeshane@gmail.com> (raw)
In-Reply-To: <20200323235138.207442-1-bigbeeshane@gmail.com>
Calls to dma_map_sg may return segments / entries than requested
if they fall on page bounderies. The old implementation did not
support this use case.
Signed-off-by: Shane Francis <bigbeeshane@gmail.com>
---
drivers/gpu/drm/radeon/radeon_ttm.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 3b92311d30b9..e6003f701517 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -528,11 +528,12 @@ static int radeon_ttm_tt_pin_userptr(struct ttm_tt *ttm)
r = -ENOMEM;
nents = dma_map_sg(rdev->dev, ttm->sg->sgl, ttm->sg->nents, direction);
- if (nents != ttm->sg->nents)
+ if (nents == 0)
goto release_sg;
- drm_prime_sg_to_page_addr_arrays(ttm->sg, ttm->pages,
- gtt->ttm.dma_address, ttm->num_pages);
+ drm_prime_dma_sg_to_page_addr_arrays(ttm->sg, ttm->pages,
+ gtt->ttm.dma_address, ttm->num_pages,
+ nents);
return 0;
--
2.26.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
prev parent reply other threads:[~2020-03-23 23:53 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-23 20:51 [PATCH 0/2] AMDGPU / DRM Fix mapping of user pages Shane Francis
2020-03-23 20:51 ` [PATCH 1/2] drm/prime: correct logic for mapping sg to arrays Shane Francis
2020-03-23 20:51 ` [PATCH 2/2] drm/amdgpu: fix scatter-gather mapping with user pages Shane Francis
2020-03-23 21:36 ` Alex Deucher
2020-03-23 22:38 ` Shane Francis
2020-03-23 23:51 ` [PATCH v2 0/3] AMDGPU / RADEON / DRM Fix mapping of " Shane Francis
2020-03-23 23:51 ` [PATCH v2 1/3] drm/prime: correct logic for mapping sg to arrays Shane Francis
2020-03-23 23:51 ` [PATCH v2 2/3] drm/amdgpu: fix scatter-gather mapping with user pages Shane Francis
2020-03-23 23:51 ` Shane Francis [this message]
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=20200323235138.207442-4-bigbeeshane@gmail.com \
--to=bigbeeshane@gmail.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 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.