Merge tag 'drm-misc-next-2020-10-27' of git://anongit.freedesktop.org/drm/drm-misc...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / armada / armada_gem.c

diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
index c343fbefe47c4e36192dbca1124453e9058e9cea..21909642ee4ca9ec3d4529afca3ff5289018dc08 100644 (file)
--- a/drivers/gpu/drm/armada/armada_gem.c
+++ b/drivers/gpu/drm/armada/armada_gem.c
@@ -389,7 +389,7 @@ armada_gem_prime_map_dma_buf(struct dma_buf_attachment *attach,
        struct armada_gem_object *dobj = drm_to_armada_gem(obj);
        struct scatterlist *sg;
        struct sg_table *sgt;
-       int i, num;
+       int i;
 
        sgt = kmalloc(sizeof(*sgt), GFP_KERNEL);
        if (!sgt)
@@ -405,22 +405,18 @@ armada_gem_prime_map_dma_buf(struct dma_buf_attachment *attach,
 
                mapping = dobj->obj.filp->f_mapping;
 
-               for_each_sg(sgt->sgl, sg, count, i) {
+               for_each_sgtable_sg(sgt, sg, i) {
                        struct page *page;
 
                        page = shmem_read_mapping_page(mapping, i);
-                       if (IS_ERR(page)) {
-                               num = i;
+                       if (IS_ERR(page))
                                goto release;
-                       }
 
                        sg_set_page(sg, page, PAGE_SIZE, 0);
                }
 
-               if (dma_map_sg(attach->dev, sgt->sgl, sgt->nents, dir) == 0) {
-                       num = sgt->nents;
+               if (dma_map_sgtable(attach->dev, sgt, dir, 0))
                        goto release;
-               }
        } else if (dobj->page) {
                /* Single contiguous page */
                if (sg_alloc_table(sgt, 1, GFP_KERNEL))
@@ -428,7 +424,7 @@ armada_gem_prime_map_dma_buf(struct dma_buf_attachment *attach,
 
                sg_set_page(sgt->sgl, dobj->page, dobj->obj.size, 0);
 
-               if (dma_map_sg(attach->dev, sgt->sgl, sgt->nents, dir) == 0)
+               if (dma_map_sgtable(attach->dev, sgt, dir, 0))
                        goto free_table;
        } else if (dobj->linear) {
                /* Single contiguous physical region - no struct page */
@@ -442,8 +438,9 @@ armada_gem_prime_map_dma_buf(struct dma_buf_attachment *attach,
        return sgt;
 
  release:
-       for_each_sg(sgt->sgl, sg, num, i)
-               put_page(sg_page(sg));
+       for_each_sgtable_sg(sgt, sg, i)
+               if (sg_page(sg))
+                       put_page(sg_page(sg));
  free_table:
        sg_free_table(sgt);
  free_sgt:
@@ -459,11 +456,12 @@ static void armada_gem_prime_unmap_dma_buf(struct dma_buf_attachment *attach,
        int i;
 
        if (!dobj->linear)
-               dma_unmap_sg(attach->dev, sgt->sgl, sgt->nents, dir);
+               dma_unmap_sgtable(attach->dev, sgt, dir, 0);
 
        if (dobj->obj.filp) {
                struct scatterlist *sg;
-               for_each_sg(sgt->sgl, sg, sgt->nents, i)
+
+               for_each_sgtable_sg(sgt, sg, i)
                        put_page(sg_page(sg));
        }