Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm...

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

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
index fd56f92f3469a08ab50a82d87e8902eb87342f7f..9a3bea738330208841b4e2a7a50aa73f8999c64d 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
@@ -411,16 +411,20 @@ int etnaviv_gem_cpu_prep(struct drm_gem_object *obj, u32 op,
        struct etnaviv_gem_object *etnaviv_obj = to_etnaviv_bo(obj);
        struct drm_device *dev = obj->dev;
        bool write = !!(op & ETNA_PREP_WRITE);
-       unsigned long remain =
-               op & ETNA_PREP_NOSYNC ? 0 : etnaviv_timeout_to_jiffies(timeout);
-       long lret;
+       int ret;
+
+       if (op & ETNA_PREP_NOSYNC) {
+               if (!reservation_object_test_signaled_rcu(etnaviv_obj->resv,
+                                                         write))
+                       return -EBUSY;
+       } else {
+               unsigned long remain = etnaviv_timeout_to_jiffies(timeout);
 
-       lret = reservation_object_wait_timeout_rcu(etnaviv_obj->resv,
-                                                  write, true, remain);
-       if (lret < 0)
-               return lret;
-       else if (lret == 0)
-               return remain == 0 ? -EBUSY : -ETIMEDOUT;
+               ret = reservation_object_wait_timeout_rcu(etnaviv_obj->resv,
+                                                         write, true, remain);
+               if (ret <= 0)
+                       return ret == 0 ? -ETIMEDOUT : ret;
+       }
 
        if (etnaviv_obj->flags & ETNA_BO_CACHED) {
                if (!etnaviv_obj->sgt) {
@@ -748,7 +752,7 @@ static struct page **etnaviv_gem_userptr_do_get_pages(
        uintptr_t ptr;
        unsigned int flags = 0;
 
-       pvec = drm_malloc_ab(npages, sizeof(struct page *));
+       pvec = kvmalloc_array(npages, sizeof(struct page *), GFP_KERNEL);
        if (!pvec)
                return ERR_PTR(-ENOMEM);
 
@@ -772,7 +776,7 @@ static struct page **etnaviv_gem_userptr_do_get_pages(
 
        if (ret < 0) {
                release_pages(pvec, pinned, 0);
-               drm_free_large(pvec);
+               kvfree(pvec);
                return ERR_PTR(ret);
        }
 
@@ -823,7 +827,7 @@ static int etnaviv_gem_userptr_get_pages(struct etnaviv_gem_object *etnaviv_obj)
        mm = get_task_mm(etnaviv_obj->userptr.task);
        pinned = 0;
        if (mm == current->mm) {
-               pvec = drm_malloc_ab(npages, sizeof(struct page *));
+               pvec = kvmalloc_array(npages, sizeof(struct page *), GFP_KERNEL);
                if (!pvec) {
                        mmput(mm);
                        return -ENOMEM;
@@ -832,7 +836,7 @@ static int etnaviv_gem_userptr_get_pages(struct etnaviv_gem_object *etnaviv_obj)
                pinned = __get_user_pages_fast(etnaviv_obj->userptr.ptr, npages,
                                               !etnaviv_obj->userptr.ro, pvec);
                if (pinned < 0) {
-                       drm_free_large(pvec);
+                       kvfree(pvec);
                        mmput(mm);
                        return pinned;
                }
@@ -845,7 +849,7 @@ static int etnaviv_gem_userptr_get_pages(struct etnaviv_gem_object *etnaviv_obj)
        }
 
        release_pages(pvec, pinned, 0);
-       drm_free_large(pvec);
+       kvfree(pvec);
 
        work = kmalloc(sizeof(*work), GFP_KERNEL);
        if (!work) {
@@ -879,7 +883,7 @@ static void etnaviv_gem_userptr_release(struct etnaviv_gem_object *etnaviv_obj)
                int npages = etnaviv_obj->base.size >> PAGE_SHIFT;
 
                release_pages(etnaviv_obj->pages, npages, 0);
-               drm_free_large(etnaviv_obj->pages);
+               kvfree(etnaviv_obj->pages);
        }
        put_task_struct(etnaviv_obj->userptr.task);
 }