drm/radeon/prime: reserve/unreserve around pin
I finally got to test this code a bit more and hit the ttm no reserved assert, so add the reservations around the pinning. Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
parent
0ec0612a80
commit
489797d510
|
@ -169,11 +169,17 @@ struct dma_buf *radeon_gem_prime_export(struct drm_device *dev,
|
|||
struct radeon_bo *bo = gem_to_radeon_bo(obj);
|
||||
int ret = 0;
|
||||
|
||||
/* pin buffer into GTT */
|
||||
ret = radeon_bo_pin(bo, RADEON_GEM_DOMAIN_GTT, NULL);
|
||||
if (ret)
|
||||
ret = radeon_bo_reserve(bo, false);
|
||||
if (unlikely(ret != 0))
|
||||
return ERR_PTR(ret);
|
||||
|
||||
/* pin buffer into GTT */
|
||||
ret = radeon_bo_pin(bo, RADEON_GEM_DOMAIN_GTT, NULL);
|
||||
if (ret) {
|
||||
radeon_bo_unreserve(bo);
|
||||
return ERR_PTR(ret);
|
||||
}
|
||||
radeon_bo_unreserve(bo);
|
||||
return dma_buf_export(bo, &radeon_dmabuf_ops, obj->size, flags);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue