Merge tag 'drm-for-v4.15-part2-fixes' of git://people.freedesktop.org/~airlied/linux

[sfrench/cifs-2.6.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 ccde12d9e5f549c6c5732f50fc3689ab5aa312ce..382a77a1097e735468558415d3fa860afbb8c818 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/i915_gem_userptr.c
@@ -549,7 +549,7 @@ __i915_gem_userptr_get_pages_worker(struct work_struct *_work)
        }
        mutex_unlock(&obj->mm.lock);
 
        }
        mutex_unlock(&obj->mm.lock);
 

-       release_pages(pvec, pinned, 0);
+       release_pages(pvec, pinned);

        kvfree(pvec);
 
        i915_gem_object_put(obj);
        kvfree(pvec);
 
        i915_gem_object_put(obj);


@@ -662,7 +662,7 @@ static int i915_gem_userptr_get_pages(struct drm_i915_gem_object *obj)
                __i915_gem_userptr_set_active(obj, true);
 
        if (IS_ERR(pages))
                __i915_gem_userptr_set_active(obj, true);
 
        if (IS_ERR(pages))

-               release_pages(pvec, pinned, 0);
+               release_pages(pvec, pinned);

        kvfree(pvec);
 
        return PTR_ERR_OR_ZERO(pages);
        kvfree(pvec);
 
        return PTR_ERR_OR_ZERO(pages);