diff options
author | Dave Airlie <airlied@redhat.com> | 2020-03-27 03:33:13 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2020-03-27 03:33:23 +0100 |
commit | 5117c363eb213d5503f5b7e39c9bfafd46388184 (patch) | |
tree | 7f867b9405619ebd81486b1d85ca15822863401a /drivers/gpu/drm/radeon | |
parent | Linux 5.6-rc7 (diff) | |
parent | drm/radeon: fix scatter-gather mapping with user pages (diff) | |
download | linux-5117c363eb213d5503f5b7e39c9bfafd46388184.tar.xz linux-5117c363eb213d5503f5b7e39c9bfafd46388184.zip |
Merge tag 'drm-misc-fixes-2020-03-26' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
drm-misc-fixes for v5.6:
- SG fixes for prime, radeon and amdgpu.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ef10e822-76dd-125d-ec1f-9a78c5f76bc3@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/radeon')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_ttm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 3b92311d30b9..b3380ffab4c2 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -528,7 +528,7 @@ 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, |