drm/prime: split array import functions v4

Mapping the imported pages of a DMA-buf into an userspace process
doesn't work as expected.

But we have reoccurring requests on this approach, so split the
functions for this and  document that dma_buf_mmap() needs to be used
instead.

v2: split it into two functions
v3: rebased on latest changes
v4: update commit message a bit

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

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 02748e030322489449d465d2322240b139730fe9..a34fedcc8b61b5a85d7317da3020db6a8c49bc50 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -918,8 +918,8 @@ static int amdgpu_ttm_tt_pin_userptr(struct ttm_bo_device *bdev,
                goto release_sg;
 
        /* convert SG to linear array of pages and dma addresses */
-       drm_prime_sg_to_page_addr_arrays(ttm->sg, NULL, gtt->ttm.dma_address,
-                                        ttm->num_pages);
+       drm_prime_sg_to_dma_addr_array(ttm->sg, gtt->ttm.dma_address,
+                                      ttm->num_pages);
 
        return 0;
 
@@ -1264,9 +1264,8 @@ static int amdgpu_ttm_tt_populate(struct ttm_bo_device *bdev,
                        ttm->sg = sgt;
                }
 
-               drm_prime_sg_to_page_addr_arrays(ttm->sg, NULL,
-                                                gtt->ttm.dma_address,
-                                                ttm->num_pages);
+               drm_prime_sg_to_dma_addr_array(ttm->sg, gtt->ttm.dma_address,
+                                              ttm->num_pages);
                return 0;
        }
 

diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
index 7db55fce35d837153f427148b9044cd607df3bfc..683aa29ecd3b7c50c0c785cb3bb5b6b83ad9c175 100644 (file)
--- a/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@ -978,44 +978,58 @@ struct drm_gem_object *drm_gem_prime_import(struct drm_device *dev,
 EXPORT_SYMBOL(drm_gem_prime_import);
 
 /**
- * drm_prime_sg_to_page_addr_arrays - convert an sg table into a page array
+ * drm_prime_sg_to_page_array - convert an sg table into a page array
  * @sgt: scatter-gather table to convert
- * @pages: optional array of page pointers to store the page array in
- * @addrs: optional array to store the dma bus address of each page
+ * @pages: array of page pointers to store the pages in
+ * @max_entries: size of the passed-in array
+ *
+ * Exports an sg table into an array of pages.
+ *
+ * This function is deprecated and strongly discouraged to be used.
+ * The page array is only useful for page faults and those can corrupt fields
+ * in the struct page if they are not handled by the exporting driver.
+ */
+int __deprecated drm_prime_sg_to_page_array(struct sg_table *sgt,
+                                           struct page **pages,
+                                           int max_entries)
+{
+       struct sg_page_iter page_iter;
+       struct page **p = pages;
+
+       for_each_sgtable_page(sgt, &page_iter, 0) {
+               if (WARN_ON(p - pages >= max_entries))
+                       return -1;
+               *p++ = sg_page_iter_page(&page_iter);
+       }
+       return 0;
+}
+EXPORT_SYMBOL(drm_prime_sg_to_page_array);
+
+/**
+ * drm_prime_sg_to_dma_addr_array - convert an sg table into a dma addr array
+ * @sgt: scatter-gather table to convert
+ * @addrs: array to store the dma bus address of each page
  * @max_entries: size of both the passed-in arrays
  *
- * Exports an sg table into an array of pages and addresses. This is currently
- * required by the TTM driver in order to do correct fault handling.
+ * Exports an sg table into an array of addresses.
  *
- * Drivers can use this in their &drm_driver.gem_prime_import_sg_table
+ * Drivers should use this in their &drm_driver.gem_prime_import_sg_table
  * implementation.
  */
-int drm_prime_sg_to_page_addr_arrays(struct sg_table *sgt, struct page **pages,
-                                    dma_addr_t *addrs, int max_entries)
+int drm_prime_sg_to_dma_addr_array(struct sg_table *sgt, dma_addr_t *addrs,
+                                  int max_entries)
 {
        struct sg_dma_page_iter dma_iter;
-       struct sg_page_iter page_iter;
-       struct page **p = pages;
        dma_addr_t *a = addrs;
 
-       if (pages) {
-               for_each_sgtable_page(sgt, &page_iter, 0) {
-                       if (WARN_ON(p - pages >= max_entries))
-                               return -1;
-                       *p++ = sg_page_iter_page(&page_iter);
-               }
-       }
-       if (addrs) {
-               for_each_sgtable_dma_page(sgt, &dma_iter, 0) {
-                       if (WARN_ON(a - addrs >= max_entries))
-                               return -1;
-                       *a++ = sg_page_iter_dma_address(&dma_iter);
-               }
+       for_each_sgtable_dma_page(sgt, &dma_iter, 0) {
+               if (WARN_ON(a - addrs >= max_entries))
+                       return -1;
+               *a++ = sg_page_iter_dma_address(&dma_iter);
        }
-
        return 0;
 }
-EXPORT_SYMBOL(drm_prime_sg_to_page_addr_arrays);
+EXPORT_SYMBOL(drm_prime_sg_to_dma_addr_array);
 
 /**
  * drm_prime_gem_destroy - helper to clean up a PRIME-imported GEM object

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
index d9bd83203a15e5d4cb10f0875e1067a6afbe4c49..b390dd4d60b76d929fc2847484f1a8067126d2b9 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
@@ -135,8 +135,7 @@ struct drm_gem_object *etnaviv_gem_prime_import_sg_table(struct drm_device *dev,
                goto fail;
        }
 
-       ret = drm_prime_sg_to_page_addr_arrays(sgt, etnaviv_obj->pages,
-                                              NULL, npages);
+       ret = drm_prime_sg_to_page_array(sgt, etnaviv_obj->pages, npages);
        if (ret)
                goto fail;
 

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
index 28a2ee1336ef7a479e4ad3373fbb9b41b7b21304..280ea0d5e84003a6e920a500df2a9503ca4c923a 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
@@ -260,7 +260,7 @@ int mtk_drm_gem_prime_vmap(struct drm_gem_object *obj, struct dma_buf_map *map)
                return -ENOMEM;
        }
 
-       drm_prime_sg_to_page_addr_arrays(sgt, mtk_gem->pages, NULL, npages);
+       drm_prime_sg_to_page_array(sgt, mtk_gem->pages, npages);
 
        mtk_gem->kvaddr = vmap(mtk_gem->pages, npages, VM_MAP,
                               pgprot_writecombine(PAGE_KERNEL));

diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index 311721ceee5021d3e32047f442a597edb60347ea..f995cb02b63d324eb0023522badf884ef0e5dfc0 100644 (file)
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -1180,7 +1180,7 @@ struct drm_gem_object *msm_gem_import(struct drm_device *dev,
                goto fail;
        }
 
-       ret = drm_prime_sg_to_page_addr_arrays(sgt, msm_obj->pages, NULL, npages);
+       ret = drm_prime_sg_to_page_array(sgt, msm_obj->pages, npages);
        if (ret) {
                mutex_unlock(&msm_obj->lock);
                goto fail;

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index c30f088cefcc5f1a4cf22704c8e63d94bbc28199..645e7091dffc33c3d6f2b2d14d4b1715b5b473ed 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -1235,9 +1235,8 @@ nouveau_ttm_tt_populate(struct ttm_bo_device *bdev,
                return 0;
 
        if (slave && ttm->sg) {
-               drm_prime_sg_to_page_addr_arrays(ttm->sg, NULL,
-                                                ttm_dma->dma_address,
-                                                ttm->num_pages);
+               drm_prime_sg_to_dma_addr_array(ttm->sg, ttm_dma->dma_address,
+                                              ttm->num_pages);
                return 0;
        }
 

diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c
index 30d299ca8795d6a945287b2c335d88b77f1e671a..38af6195d95936c03aba364b12d31cb3d3c7adb5 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem.c
@@ -1324,8 +1324,7 @@ struct drm_gem_object *omap_gem_new_dmabuf(struct drm_device *dev, size_t size,
                }
 
                omap_obj->pages = pages;
-               ret = drm_prime_sg_to_page_addr_arrays(sgt, pages, NULL,
-                                                      npages);
+               ret = drm_prime_sg_to_page_array(sgt, pages, npages);
                if (ret) {
                        omap_gem_free_object(obj);
                        obj = ERR_PTR(-ENOMEM);

diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 917419bf1578ac904248e90d95bf8067bbd71d84..f1f7adb67c8e6beb01f6a06efb2dbb81a5727e08 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -395,8 +395,8 @@ static int radeon_ttm_tt_pin_userptr(struct ttm_bo_device *bdev, struct ttm_tt *
        if (r)
                goto release_sg;
 
-       drm_prime_sg_to_page_addr_arrays(ttm->sg, NULL, gtt->ttm.dma_address,
-                                        ttm->num_pages);
+       drm_prime_sg_to_dma_addr_array(ttm->sg, gtt->ttm.dma_address,
+                                      ttm->num_pages);
 
        return 0;
 
@@ -574,9 +574,8 @@ static int radeon_ttm_tt_populate(struct ttm_bo_device *bdev,
        }
 
        if (slave && ttm->sg) {
-               drm_prime_sg_to_page_addr_arrays(ttm->sg, NULL,
-                                                gtt->ttm.dma_address,
-                                                ttm->num_pages);
+               drm_prime_sg_to_dma_addr_array(ttm->sg, gtt->ttm.dma_address,
+                                              ttm->num_pages);
                return 0;
        }
 

diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c
index f8635ccaf9a1703338aa633ff1507b5611e0d473..a0e75f1d5d016cee0832bf9185f68d700f9ab702 100644 (file)
--- a/drivers/gpu/drm/vgem/vgem_drv.c
+++ b/drivers/gpu/drm/vgem/vgem_drv.c
@@ -356,8 +356,7 @@ static struct drm_gem_object *vgem_prime_import_sg_table(struct drm_device *dev,
        }
 
        obj->pages_pin_count++; /* perma-pinned */
-       drm_prime_sg_to_page_addr_arrays(obj->table, obj->pages, NULL,
-                                       npages);
+       drm_prime_sg_to_page_array(obj->table, obj->pages, npages);
        return &obj->base;
 }
 

diff --git a/drivers/gpu/drm/xen/xen_drm_front_gem.c b/drivers/gpu/drm/xen/xen_drm_front_gem.c
index 74db5a840bed07b5f53eeca2fa58a508a54cb7d0..b293c67230eff50a499c68177f5be0d71b160cd7 100644 (file)
--- a/drivers/gpu/drm/xen/xen_drm_front_gem.c
+++ b/drivers/gpu/drm/xen/xen_drm_front_gem.c
@@ -220,8 +220,8 @@ xen_drm_front_gem_import_sg_table(struct drm_device *dev,
 
        xen_obj->sgt_imported = sgt;
 
-       ret = drm_prime_sg_to_page_addr_arrays(sgt, xen_obj->pages,
-                                              NULL, xen_obj->num_pages);
+       ret = drm_prime_sg_to_page_array(sgt, xen_obj->pages,
+                                        xen_obj->num_pages);
        if (ret < 0)
                return ERR_PTR(ret);
 

diff --git a/include/drm/drm_prime.h b/include/drm/drm_prime.h
index 0991a47a1567014f3f133e05d0215901055841ca..54f2c58305d2b95a758684514683b9219909d9b2 100644 (file)
--- a/include/drm/drm_prime.h
+++ b/include/drm/drm_prime.h
@@ -105,8 +105,9 @@ struct drm_gem_object *drm_gem_prime_import(struct drm_device *dev,
 
 void drm_prime_gem_destroy(struct drm_gem_object *obj, struct sg_table *sg);
 
-int drm_prime_sg_to_page_addr_arrays(struct sg_table *sgt, struct page **pages,
-                                    dma_addr_t *addrs, int max_pages);
-
+int drm_prime_sg_to_page_array(struct sg_table *sgt, struct page **pages,
+                              int max_pages);
+int drm_prime_sg_to_dma_addr_array(struct sg_table *sgt, dma_addr_t *addrs,
+                                  int max_pages);
 
 #endif /* __DRM_PRIME_H__ */