Merge tag 'v4.6-rc3' into drm-intel-next-queued

[cascardo/linux.git] / drivers / gpu / drm / i915 / i915_gem_userptr.c

diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c
index d597414..0f94b6c 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/i915_gem_userptr.c
@@ -500,11 +500,11 @@ __i915_gem_userptr_get_pages_worker(struct work_struct *_work)
 
                down_read(&mm->mmap_sem);
                while (pinned < npages) {
-                       ret = get_user_pages(work->task, mm,
-                                            obj->userptr.ptr + pinned * PAGE_SIZE,
-                                            npages - pinned,
-                                            !obj->userptr.read_only, 0,
-                                            pvec + pinned, NULL);
+                       ret = get_user_pages_remote(work->task, mm,
+                                       obj->userptr.ptr + pinned * PAGE_SIZE,
+                                       npages - pinned,
+                                       !obj->userptr.read_only, 0,
+                                       pvec + pinned, NULL);
                        if (ret < 0)
                                break;
 
@@ -677,7 +677,7 @@ i915_gem_userptr_put_pages(struct drm_i915_gem_object *obj)
                        set_page_dirty(page);
 
                mark_page_accessed(page);
-               page_cache_release(page);
+               put_page(page);
        }
        obj->dirty = 0;