diff options
author | Dave Airlie <airlied@redhat.com> | 2020-03-31 15:15:47 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2020-03-31 15:15:47 +1000 |
commit | 5fc0df93fccd4dc8412bfc488ba4ba8268aa12dc (patch) | |
tree | 6091ced63dbba747619762470ebba2298676ea0d /drivers/gpu/drm/radeon | |
parent | Merge tag 'drm-intel-next-fixes-2020-03-27' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (diff) | |
parent | Linux 5.6 (diff) | |
download | linux-dev-5fc0df93fccd4dc8412bfc488ba4ba8268aa12dc.tar.xz linux-dev-5fc0df93fccd4dc8412bfc488ba4ba8268aa12dc.zip |
Merge v5.6 into drm-next
msm needed rc6, so I just went and merged release
(msm has been in drm-next outside of this tree)
Signed-off-by: Dave Airlie <airlied@redhat.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 badf1b6d1549..5d50c9edbe80 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -523,7 +523,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, |