if (entry->vde->domain)
                tegra_vde_iommu_unmap(entry->vde, entry->iova);
 
-       dma_buf_unmap_attachment(entry->a, entry->sgt, entry->dma_dir);
+       dma_buf_unmap_attachment_unlocked(entry->a, entry->sgt, entry->dma_dir);
        dma_buf_detach(dmabuf, entry->a);
        dma_buf_put(dmabuf);
 
                goto err_unlock;
        }
 
-       sgt = dma_buf_map_attachment(attachment, dma_dir);
+       sgt = dma_buf_map_attachment_unlocked(attachment, dma_dir);
        if (IS_ERR(sgt)) {
                dev_err(dev, "Failed to get dmabufs sg_table\n");
                err = PTR_ERR(sgt);
 err_free:
        kfree(entry);
 err_unmap:
-       dma_buf_unmap_attachment(attachment, sgt, dma_dir);
+       dma_buf_unmap_attachment_unlocked(attachment, sgt, dma_dir);
 err_detach:
        dma_buf_detach(dmabuf, attachment);
 err_unlock: