Merge drm/drm-next into drm-misc-next

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

diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c
index 5e9d29961307e1063592ed0dae01b823f20c13a1..2165633c9b9e84a861f73b01be808854632ac27d 100644 (file)
--- a/drivers/gpu/drm/drm_gem_cma_helper.c
+++ b/drivers/gpu/drm/drm_gem_cma_helper.c
@@ -470,26 +470,9 @@ drm_gem_cma_prime_import_sg_table(struct drm_device *dev,
 {
        struct drm_gem_cma_object *cma_obj;
 
-       if (sgt->nents != 1) {
-               /* check if the entries in the sg_table are contiguous */
-               dma_addr_t next_addr = sg_dma_address(sgt->sgl);
-               struct scatterlist *s;
-               unsigned int i;
-
-               for_each_sg(sgt->sgl, s, sgt->nents, i) {
-                       /*
-                        * sg_dma_address(s) is only valid for entries
-                        * that have sg_dma_len(s) != 0
-                        */
-                       if (!sg_dma_len(s))
-                               continue;
-
-                       if (sg_dma_address(s) != next_addr)
-                               return ERR_PTR(-EINVAL);
-
-                       next_addr = sg_dma_address(s) + sg_dma_len(s);
-               }
-       }
+       /* check if the entries in the sg_table are contiguous */
+       if (drm_prime_get_contiguous_size(sgt) < attach->dmabuf->size)
+               return ERR_PTR(-EINVAL);
 
        /* Create a CMA GEM buffer. */
        cma_obj = __drm_gem_cma_create(dev, attach->dmabuf->size);