Skip to content

Commit

Permalink
drm/i915: Call the unlocked version of i915_gem_object_get_pages()
Browse files Browse the repository at this point in the history
When we hold for the lock for swapping out the shmem pages for the
physically contiguous pages, we have to call the unlocked version of
get_pages!

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101934
Fixes: 35d23516946e ("drm/i915: Make i915_gem_object_phys_attach() use obj->mm.lock more appropriately")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20170726181602.23527-2-chris@chris-wilson.co.uk
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Chris Wilson authored and Daniel Vetter committed Jul 27, 2017
1 parent 8eeb790 commit 8fb6a5d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/i915_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -5324,7 +5324,7 @@ int i915_gem_object_attach_phys(struct drm_i915_gem_object *obj, int align)
pages = obj->mm.pages;
obj->ops = &i915_gem_phys_ops;

err = __i915_gem_object_get_pages(obj);
err = ____i915_gem_object_get_pages(obj);
if (err)
goto err_xfer;

Expand Down

0 comments on commit 8fb6a5d

Please sign in to comment.