From: Thierry Reding <tred...@nvidia.com>

When an importer wants to map a DMA-BUF, make sure to always actually
map it, irrespective of whether the buffer is contiguous or not.

Signed-off-by: Thierry Reding <tred...@nvidia.com>
---
 drivers/gpu/drm/tegra/gem.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index 3345cce14662..00701cadaceb 100644
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -516,15 +516,15 @@ tegra_gem_prime_map_dma_buf(struct dma_buf_attachment 
*attach,
 
                for_each_sg(sgt->sgl, sg, bo->num_pages, i)
                        sg_set_page(sg, bo->pages[i], PAGE_SIZE, 0);
-
-               if (dma_map_sg(attach->dev, sgt->sgl, sgt->nents, dir) == 0)
-                       goto free;
        } else {
                if (dma_get_sgtable(attach->dev, sgt, bo->vaddr, bo->iova,
                                    gem->size) < 0)
                        goto free;
        }
 
+       if (dma_map_sg(attach->dev, sgt->sgl, sgt->nents, dir) == 0)
+               goto free;
+
        return sgt;
 
 free:
-- 
2.23.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to