[Intel-gfx] [PATCH 2/2] drm/i915: Call the unlocked version of i915_gem_object_get_pages()

Chris Wilson chris at chris-wilson.co.uk
Wed Jul 26 18:16:02 UTC 2017


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 at chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/i915_gem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
 
-- 
2.13.3



More information about the Intel-gfx mailing list