dma-buf: wait for map to complete for static attachments

We have previously done that in the individual drivers but it is
more defensive to move that into the common code.

Dynamic attachments should wait for map operations to complete by themselves.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20220407085946.744568-12-christian.koenig@amd.com

diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
index 1cddb65eafdabaf9aaf20db05dc3b8f44158537d..79795857be3e3649d0dbde39bbdfe3e03bebbbb3 100644 (file)
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@ -661,12 +661,24 @@ static struct sg_table * __map_dma_buf(struct dma_buf_attachment *attach,
                                       enum dma_data_direction direction)
 {
        struct sg_table *sg_table;
+       signed long ret;
 
        sg_table = attach->dmabuf->ops->map_dma_buf(attach, direction);
+       if (IS_ERR_OR_NULL(sg_table))
+               return sg_table;
+
+       if (!dma_buf_attachment_is_dynamic(attach)) {
+               ret = dma_resv_wait_timeout(attach->dmabuf->resv,
+                                           DMA_RESV_USAGE_KERNEL, true,
+                                           MAX_SCHEDULE_TIMEOUT);
+               if (ret < 0) {
+                       attach->dmabuf->ops->unmap_dma_buf(attach, sg_table,
+                                                          direction);
+                       return ERR_PTR(ret);
+               }
+       }
 
-       if (!IS_ERR_OR_NULL(sg_table))
-               mangle_sg_table(sg_table);
-
+       mangle_sg_table(sg_table);
        return sg_table;
 }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
index 579adfafe4d09f990e168e128900089d7282345b..782cbca37538fd1d99b4d6dfd4d7ca812523ebb3 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
@@ -102,21 +102,9 @@ static int amdgpu_dma_buf_pin(struct dma_buf_attachment *attach)
 {
        struct drm_gem_object *obj = attach->dmabuf->priv;
        struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj);
-       int r;
 
        /* pin buffer into GTT */
-       r = amdgpu_bo_pin(bo, AMDGPU_GEM_DOMAIN_GTT);
-       if (r)
-               return r;
-
-       if (bo->tbo.moving) {
-               r = dma_fence_wait(bo->tbo.moving, true);
-               if (r) {
-                       amdgpu_bo_unpin(bo);
-                       return r;
-               }
-       }
-       return 0;
+       return amdgpu_bo_pin(bo, AMDGPU_GEM_DOMAIN_GTT);
 }
 
 /**

diff --git a/drivers/gpu/drm/nouveau/nouveau_prime.c b/drivers/gpu/drm/nouveau/nouveau_prime.c
index 60019d0532fcff81cd499733d41952afafa91323..347488685f745a2cd80a88b431769daa59006371 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_prime.c
+++ b/drivers/gpu/drm/nouveau/nouveau_prime.c
@@ -93,22 +93,7 @@ int nouveau_gem_prime_pin(struct drm_gem_object *obj)
        if (ret)
                return -EINVAL;
 
-       ret = ttm_bo_reserve(&nvbo->bo, false, false, NULL);
-       if (ret)
-               goto error;
-
-       if (nvbo->bo.moving)
-               ret = dma_fence_wait(nvbo->bo.moving, true);
-
-       ttm_bo_unreserve(&nvbo->bo);
-       if (ret)
-               goto error;
-
-       return ret;
-
-error:
-       nouveau_bo_unpin(nvbo);
-       return ret;
+       return 0;
 }
 
 void nouveau_gem_prime_unpin(struct drm_gem_object *obj)

diff --git a/drivers/gpu/drm/radeon/radeon_prime.c b/drivers/gpu/drm/radeon/radeon_prime.c
index 4a90807351e72d7ffcf0484867600ab19e2ef5e1..42a87948e28c5bed77428455708c5f5a85b8743d 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_prime.c
+++ b/drivers/gpu/drm/radeon/radeon_prime.c
@@ -77,19 +77,9 @@ int radeon_gem_prime_pin(struct drm_gem_object *obj)
 
        /* pin buffer into GTT */
        ret = radeon_bo_pin(bo, RADEON_GEM_DOMAIN_GTT, NULL);
-       if (unlikely(ret))
-               goto error;
-
-       if (bo->tbo.moving) {
-               ret = dma_fence_wait(bo->tbo.moving, false);
-               if (unlikely(ret)) {
-                       radeon_bo_unpin(bo);
-                       goto error;
-               }
-       }
-
-       bo->prime_shared_count++;
-error:
+       if (likely(ret == 0))
+               bo->prime_shared_count++;
+
        radeon_bo_unreserve(bo);
        return ret;
 }