Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.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 7d066a91d7784f628590e829f306ea8dfe0699c8..aa6e35ddc87f5b5596a5f318ad7d2c5d7098449c 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
@@ -202,15 +202,14 @@ int etnaviv_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
        }
 
        /* We don't use vmf->pgoff since that has the fake offset: */
-       pgoff = ((unsigned long)vmf->virtual_address -
-                       vma->vm_start) >> PAGE_SHIFT;
+       pgoff = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
 
        page = pages[pgoff];
 
-       VERB("Inserting %p pfn %lx, pa %lx", vmf->virtual_address,
+       VERB("Inserting %p pfn %lx, pa %lx", (void *)vmf->address,
             page_to_pfn(page), page_to_pfn(page) << PAGE_SHIFT);
 
-       ret = vm_insert_page(vma, (unsigned long)vmf->virtual_address, page);
+       ret = vm_insert_page(vma, vmf->address, page);
 
 out:
        switch (ret) {
@@ -487,7 +486,7 @@ static void etnaviv_gem_describe(struct drm_gem_object *obj, struct seq_file *m)
 
        seq_printf(m, "%08x: %c %2d (%2d) %08lx %p %zd\n",
                        etnaviv_obj->flags, is_active(etnaviv_obj) ? 'A' : 'I',
-                       obj->name, obj->refcount.refcount.counter,
+                       obj->name, kref_read(&obj->refcount),
                        off, etnaviv_obj->vaddr, obj->size);
 
        rcu_read_lock();
@@ -759,7 +758,7 @@ static struct page **etnaviv_gem_userptr_do_get_pages(
        down_read(&mm->mmap_sem);
        while (pinned < npages) {
                ret = get_user_pages_remote(task, mm, ptr, npages - pinned,
-                                           flags, pvec + pinned, NULL);
+                                           flags, pvec + pinned, NULL, NULL);
                if (ret < 0)
                        break;