diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2017-07-26 19:16:02 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-07-27 09:56:11 +0200 |
| commit | 8fb6a5df4612757d6aa4218750aa3ecaca609bd0 (patch) | |
| tree | 48facd71c727d88b9da6b485944ac81446f31ef0 | |
| parent | 8eeb79060b3bea3790e02488d4ebf322487bf8af (diff) | |
| download | linux-8fb6a5df4612757d6aa4218750aa3ecaca609bd0.tar.gz linux-8fb6a5df4612757d6aa4218750aa3ecaca609bd0.tar.bz2 linux-8fb6a5df4612757d6aa4218750aa3ecaca609bd0.zip | |
drm/i915: Call the unlocked version of i915_gem_object_get_pages()
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>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 85231d1c39c3..000a764ee8d9 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -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; |