| Message ID | 20200323235138.207442-4-bigbeeshane@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | AMDGPU / RADEON / DRM Fix mapping of user pages | expand |
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;
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(-)