drm/msm/gem: Rename to pin/unpin_pages

[linux-2.6-microblaze.git] / drivers / gpu / drm / msm / msm_gem.c

diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index 7f92231..3da64c7 100644 (file)
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -19,7 +19,7 @@
 #include "msm_gpu.h"
 #include "msm_mmu.h"
 
-static void update_inactive(struct msm_gem_object *msm_obj);
+static void update_lru(struct drm_gem_object *obj);
 
 static dma_addr_t physaddr(struct drm_gem_object *obj)
 {
@@ -129,10 +129,10 @@ static struct page **get_pages(struct drm_gem_object *obj)
                /* For non-cached buffers, ensure the new pages are clean
                 * because display controller, GPU, etc. are not coherent:
                 */
-               if (msm_obj->flags & (MSM_BO_WC|MSM_BO_UNCACHED))
+               if (msm_obj->flags & MSM_BO_WC)
                        sync_for_device(msm_obj);
 
-               update_inactive(msm_obj);
+               update_lru(obj);
        }
 
        return msm_obj->pages;
@@ -160,7 +160,7 @@ static void put_pages(struct drm_gem_object *obj)
                         * pages are clean because display controller,
                         * GPU, etc. are not coherent:
                         */
-                       if (msm_obj->flags & (MSM_BO_WC|MSM_BO_UNCACHED))
+                       if (msm_obj->flags & MSM_BO_WC)
                                sync_for_cpu(msm_obj);
 
                        sg_free_table(msm_obj->sgt);
@@ -177,43 +177,51 @@ static void put_pages(struct drm_gem_object *obj)
        }
 }
 
-struct page **msm_gem_get_pages(struct drm_gem_object *obj)
+static struct page **msm_gem_pin_pages_locked(struct drm_gem_object *obj)
 {
        struct msm_gem_object *msm_obj = to_msm_bo(obj);
        struct page **p;
 
-       msm_gem_lock(obj);
+       GEM_WARN_ON(!msm_gem_is_locked(obj));
 
        if (GEM_WARN_ON(msm_obj->madv != MSM_MADV_WILLNEED)) {
-               msm_gem_unlock(obj);
                return ERR_PTR(-EBUSY);
        }
 
        p = get_pages(obj);
-
        if (!IS_ERR(p)) {
                msm_obj->pin_count++;
-               update_inactive(msm_obj);
+               update_lru(obj);
        }
 
+       return p;
+}
+
+struct page **msm_gem_pin_pages(struct drm_gem_object *obj)
+{
+       struct page **p;
+
+       msm_gem_lock(obj);
+       p = msm_gem_pin_pages_locked(obj);
        msm_gem_unlock(obj);
+
        return p;
 }
 
-void msm_gem_put_pages(struct drm_gem_object *obj)
+void msm_gem_unpin_pages(struct drm_gem_object *obj)
 {
        struct msm_gem_object *msm_obj = to_msm_bo(obj);
 
        msm_gem_lock(obj);
        msm_obj->pin_count--;
        GEM_WARN_ON(msm_obj->pin_count < 0);
-       update_inactive(msm_obj);
+       update_lru(obj);
        msm_gem_unlock(obj);
 }
 
 static pgprot_t msm_gem_pgprot(struct msm_gem_object *msm_obj, pgprot_t prot)
 {
-       if (msm_obj->flags & (MSM_BO_WC|MSM_BO_UNCACHED))
+       if (msm_obj->flags & MSM_BO_WC)
                return pgprot_writecombine(prot);
        return prot;
 }
@@ -259,7 +267,8 @@ static vm_fault_t msm_gem_fault(struct vm_fault *vmf)
        VERB("Inserting %p pfn %lx, pa %lx", (void *)vmf->address,
                        pfn, pfn << PAGE_SHIFT);
 
-       ret = vmf_insert_mixed(vma, vmf->address, __pfn_to_pfn_t(pfn, PFN_DEV));
+       ret = vmf_insert_pfn(vma, vmf->address, pfn);
+
 out_unlock:
        msm_gem_unlock(obj);
 out:
@@ -448,7 +457,7 @@ void msm_gem_unpin_locked(struct drm_gem_object *obj)
        msm_obj->pin_count--;
        GEM_WARN_ON(msm_obj->pin_count < 0);
 
-       update_inactive(msm_obj);
+       update_lru(obj);
 }
 
 struct msm_gem_vma *msm_gem_get_vma_locked(struct drm_gem_object *obj,
@@ -657,7 +666,7 @@ static void *get_vaddr(struct drm_gem_object *obj, unsigned madv)
                        goto fail;
                }
 
-               update_inactive(msm_obj);
+               update_lru(obj);
        }
 
        return msm_obj->vaddr;
@@ -729,7 +738,7 @@ int msm_gem_madvise(struct drm_gem_object *obj, unsigned madv)
         * between inactive lists
         */
        if (msm_obj->active_count == 0)
-               update_inactive(msm_obj);
+               update_lru(obj);
 
        msm_gem_unlock(obj);
 
@@ -756,7 +765,7 @@ void msm_gem_purge(struct drm_gem_object *obj)
        put_iova_vmas(obj);
 
        msm_obj->madv = __MSM_MADV_PURGED;
-       update_inactive(msm_obj);
+       update_lru(obj);
 
        drm_gem_free_mmap_offset(obj);
 
@@ -791,7 +800,7 @@ void msm_gem_evict(struct drm_gem_object *obj)
 
        put_pages(obj);
 
-       update_inactive(msm_obj);
+       update_lru(obj);
 }
 
 void msm_gem_vunmap(struct drm_gem_object *obj)
@@ -834,13 +843,14 @@ void msm_gem_active_put(struct drm_gem_object *obj)
        GEM_WARN_ON(!msm_gem_is_locked(obj));
 
        if (--msm_obj->active_count == 0) {
-               update_inactive(msm_obj);
+               update_lru(obj);
        }
 }
 
-static void update_inactive(struct msm_gem_object *msm_obj)
+static void update_lru(struct drm_gem_object *obj)
 {
-       struct msm_drm_private *priv = msm_obj->base.dev->dev_private;
+       struct msm_drm_private *priv = obj->dev->dev_private;
+       struct msm_gem_object *msm_obj = to_msm_bo(obj);
 
        GEM_WARN_ON(!msm_gem_is_locked(&msm_obj->base));
 
@@ -869,6 +879,16 @@ static void update_inactive(struct msm_gem_object *msm_obj)
        mutex_unlock(&priv->mm_lock);
 }
 
+bool msm_gem_active(struct drm_gem_object *obj)
+{
+       GEM_WARN_ON(!msm_gem_is_locked(obj));
+
+       if (to_msm_bo(obj)->pin_count)
+               return true;
+
+       return !dma_resv_test_signaled(obj->resv, dma_resv_usage_rw(true));
+}
+
 int msm_gem_cpu_prep(struct drm_gem_object *obj, uint32_t op, ktime_t *timeout)
 {
        bool write = !!(op & MSM_PREP_WRITE);
@@ -1004,7 +1024,7 @@ void msm_gem_describe_objects(struct list_head *list, struct seq_file *m)
 #endif
 
 /* don't call directly!  Use drm_gem_object_put() */
-void msm_gem_free_object(struct drm_gem_object *obj)
+static void msm_gem_free_object(struct drm_gem_object *obj)
 {
        struct msm_gem_object *msm_obj = to_msm_bo(obj);
        struct drm_device *dev = obj->dev;
@@ -1020,8 +1040,6 @@ void msm_gem_free_object(struct drm_gem_object *obj)
        list_del(&msm_obj->mm_list);
        mutex_unlock(&priv->mm_lock);
 
-       msm_gem_lock(obj);
-
        /* object should not be on active list: */
        GEM_WARN_ON(is_active(msm_obj));
 
@@ -1037,17 +1055,11 @@ void msm_gem_free_object(struct drm_gem_object *obj)
 
                put_iova_vmas(obj);
 
-               /* dma_buf_detach() grabs resv lock, so we need to unlock
-                * prior to drm_prime_gem_destroy
-                */
-               msm_gem_unlock(obj);
-
                drm_prime_gem_destroy(obj, msm_obj->sgt);
        } else {
                msm_gem_vunmap(obj);
                put_pages(obj);
                put_iova_vmas(obj);
-               msm_gem_unlock(obj);
        }
 
        drm_gem_object_release(obj);
@@ -1059,7 +1071,7 @@ static int msm_gem_object_mmap(struct drm_gem_object *obj, struct vm_area_struct
 {
        struct msm_gem_object *msm_obj = to_msm_bo(obj);
 
-       vma->vm_flags |= VM_IO | VM_MIXEDMAP | VM_DONTEXPAND | VM_DONTDUMP;
+       vma->vm_flags |= VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP;
        vma->vm_page_prot = msm_gem_pgprot(msm_obj, vm_get_page_prot(vma->vm_flags));
 
        return 0;
@@ -1114,7 +1126,6 @@ static int msm_gem_new_impl(struct drm_device *dev,
        struct msm_gem_object *msm_obj;
 
        switch (flags & MSM_BO_CACHE_MASK) {
-       case MSM_BO_UNCACHED:
        case MSM_BO_CACHED:
        case MSM_BO_WC:
                break;