6 files changed, 37 insertions, 32 deletions

diff --git a/drivers/gpu/drm/etnaviv/Kconfig b/drivers/gpu/drm/etnaviv/Kconfig
index 71cee4e9fefb..38b477b5fbf9 100644
--- a/drivers/gpu/drm/etnaviv/Kconfig
+++ b/drivers/gpu/drm/etnaviv/Kconfig
@@ -10,6 +10,8 @@ config DRM_ETNAVIV
         select IOMMU_API
         select IOMMU_SUPPORT
         select WANT_DEV_COREDUMP
+        select CMA if HAVE_DMA_CONTIGUOUS
+        select DMA_CMA if HAVE_DMA_CONTIGUOUS
         help
           DRM driver for Vivante GPUs.
 
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
index 91e17aeee1da..2cb4773823c2 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
@@ -316,7 +316,7 @@ static int etnaviv_ioctl_gem_cpu_prep(struct drm_device *dev, void *data,
 
         ret = etnaviv_gem_cpu_prep(obj, args->op, &TS(args->timeout));
 
-        drm_gem_object_unreference_unlocked(obj);
+        drm_gem_object_put_unlocked(obj);
 
         return ret;
 }
@@ -337,7 +337,7 @@ static int etnaviv_ioctl_gem_cpu_fini(struct drm_device *dev, void *data,
 
         ret = etnaviv_gem_cpu_fini(obj);
 
-        drm_gem_object_unreference_unlocked(obj);
+        drm_gem_object_put_unlocked(obj);
 
         return ret;
 }
@@ -357,7 +357,7 @@ static int etnaviv_ioctl_gem_info(struct drm_device *dev, void *data,
                 return -ENOENT;
 
         ret = etnaviv_gem_mmap_offset(obj, &args->offset);
-        drm_gem_object_unreference_unlocked(obj);
+        drm_gem_object_put_unlocked(obj);
 
         return ret;
 }
@@ -446,7 +446,7 @@ static int etnaviv_ioctl_gem_wait(struct drm_device *dev, void *data,
 
         ret = etnaviv_gem_wait_bo(gpu, obj, timeout);
 
-        drm_gem_object_unreference_unlocked(obj);
+        drm_gem_object_put_unlocked(obj);
 
         return ret;
 }
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
index 9a3bea738330..5a634594a6ce 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
@@ -68,7 +68,7 @@ static int etnaviv_gem_shmem_get_pages(struct etnaviv_gem_object *etnaviv_obj)
         struct page **p = drm_gem_get_pages(&etnaviv_obj->base);
 
         if (IS_ERR(p)) {
-                dev_err(dev->dev, "could not get pages: %ld\n", PTR_ERR(p));
+                dev_dbg(dev->dev, "could not get pages: %ld\n", PTR_ERR(p));
                 return PTR_ERR(p);
         }
 
@@ -265,7 +265,7 @@ void etnaviv_gem_mapping_reference(struct etnaviv_vram_mapping *mapping)
 {
         struct etnaviv_gem_object *etnaviv_obj = mapping->object;
 
-        drm_gem_object_reference(&etnaviv_obj->base);
+        drm_gem_object_get(&etnaviv_obj->base);
 
         mutex_lock(&etnaviv_obj->lock);
         WARN_ON(mapping->use == 0);
@@ -282,7 +282,7 @@ void etnaviv_gem_mapping_unreference(struct etnaviv_vram_mapping *mapping)
         mapping->use -= 1;
         mutex_unlock(&etnaviv_obj->lock);
 
-        drm_gem_object_unreference_unlocked(&etnaviv_obj->base);
+        drm_gem_object_put_unlocked(&etnaviv_obj->base);
 }
 
 struct etnaviv_vram_mapping *etnaviv_gem_mapping_get(
@@ -358,7 +358,7 @@ out:
                 return ERR_PTR(ret);
 
         /* Take a reference on the object */
-        drm_gem_object_reference(obj);
+        drm_gem_object_get(obj);
         return mapping;
 }
 
@@ -413,6 +413,16 @@ int etnaviv_gem_cpu_prep(struct drm_gem_object *obj, u32 op,
         bool write = !!(op & ETNA_PREP_WRITE);
         int ret;
 
+        if (!etnaviv_obj->sgt) {
+                void *ret;
+
+                mutex_lock(&etnaviv_obj->lock);
+                ret = etnaviv_gem_get_pages(etnaviv_obj);
+                mutex_unlock(&etnaviv_obj->lock);
+                if (IS_ERR(ret))
+                        return PTR_ERR(ret);
+        }
+
         if (op & ETNA_PREP_NOSYNC) {
                 if (!reservation_object_test_signaled_rcu(etnaviv_obj->resv,
                                                           write))
@@ -427,16 +437,6 @@ int etnaviv_gem_cpu_prep(struct drm_gem_object *obj, u32 op,
         }
 
         if (etnaviv_obj->flags & ETNA_BO_CACHED) {
-                if (!etnaviv_obj->sgt) {
-                        void *ret;
-
-                        mutex_lock(&etnaviv_obj->lock);
-                        ret = etnaviv_gem_get_pages(etnaviv_obj);
-                        mutex_unlock(&etnaviv_obj->lock);
-                        if (IS_ERR(ret))
-                                return PTR_ERR(ret);
-                }
-
                 dma_sync_sg_for_cpu(dev->dev, etnaviv_obj->sgt->sgl,
                                     etnaviv_obj->sgt->nents,
                                     etnaviv_op_to_dma_dir(op));
@@ -662,7 +662,8 @@ static struct drm_gem_object *__etnaviv_gem_new(struct drm_device *dev,
                  * going to pin these pages.
                  */
                 mapping = obj->filp->f_mapping;
-                mapping_set_gfp_mask(mapping, GFP_HIGHUSER);
+                mapping_set_gfp_mask(mapping, GFP_HIGHUSER |
+                                     __GFP_RETRY_MAYFAIL | __GFP_NOWARN);
         }
 
         if (ret)
@@ -671,7 +672,7 @@ static struct drm_gem_object *__etnaviv_gem_new(struct drm_device *dev,
         return obj;
 
 fail:
-        drm_gem_object_unreference_unlocked(obj);
+        drm_gem_object_put_unlocked(obj);
         return ERR_PTR(ret);
 }
 
@@ -688,14 +689,14 @@ int etnaviv_gem_new_handle(struct drm_device *dev, struct drm_file *file,
 
         ret = etnaviv_gem_obj_add(dev, obj);
         if (ret < 0) {
-                drm_gem_object_unreference_unlocked(obj);
+                drm_gem_object_put_unlocked(obj);
                 return ret;
         }
 
         ret = drm_gem_handle_create(file, obj, handle);
 
         /* drop reference from allocate - handle holds it now */
-        drm_gem_object_unreference_unlocked(obj);
+        drm_gem_object_put_unlocked(obj);
 
         return ret;
 }
@@ -712,7 +713,7 @@ struct drm_gem_object *etnaviv_gem_new(struct drm_device *dev,
 
         ret = etnaviv_gem_obj_add(dev, obj);