accel/ivpu: Fix old dma_buf api usage
authorStanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Thu, 2 Feb 2023 09:21:14 +0000 (10:21 +0100)
committerJacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Mon, 6 Feb 2023 08:02:27 +0000 (09:02 +0100)
Update according to new dma-buf locking scheme.

Remove redundant WARN_ON()'s, dma_buf functions internally
have the same warnings already.

Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Reviewed-by: Jeffrey Hugo <quic_jhugo@quicinc.com>
Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230202092114.2637452-5-stanislaw.gruszka@linux.intel.com
drivers/accel/ivpu/ivpu_gem.c

index d1f9239..01d47d3 100644 (file)
@@ -42,9 +42,7 @@ static int prime_map_pages_locked(struct ivpu_bo *bo)
        struct ivpu_device *vdev = ivpu_bo_to_vdev(bo);
        struct sg_table *sgt;
 
-       WARN_ON(!bo->base.import_attach);
-
-       sgt = dma_buf_map_attachment(bo->base.import_attach, DMA_BIDIRECTIONAL);
+       sgt = dma_buf_map_attachment_unlocked(bo->base.import_attach, DMA_BIDIRECTIONAL);
        if (IS_ERR(sgt)) {
                ivpu_err(vdev, "Failed to map attachment: %ld\n", PTR_ERR(sgt));
                return PTR_ERR(sgt);
@@ -56,9 +54,7 @@ static int prime_map_pages_locked(struct ivpu_bo *bo)
 
 static void prime_unmap_pages_locked(struct ivpu_bo *bo)
 {
-       WARN_ON(!bo->base.import_attach);
-
-       dma_buf_unmap_attachment(bo->base.import_attach, bo->sgt, DMA_BIDIRECTIONAL);
+       dma_buf_unmap_attachment_unlocked(bo->base.import_attach, bo->sgt, DMA_BIDIRECTIONAL);
        bo->sgt = NULL;
 }