projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8eeb790
)
drm/i915: Call the unlocked version of i915_gem_object_get_pages()
author
Chris Wilson
<
[email protected]
>
Wed, 26 Jul 2017 18:16:02 +0000
(19:16 +0100)
committer
Daniel Vetter
<
[email protected]
>
Thu, 27 Jul 2017 07:56:11 +0000
(09:56 +0200)
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 <
[email protected]
>
Link:
https://patchwork.freedesktop.org/patch/msgid/
[email protected]
Reviewed-by: Matthew Auld <
[email protected]
>
Signed-off-by: Daniel Vetter <
[email protected]
>
drivers/gpu/drm/i915/i915_gem.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/i915_gem.c
b/drivers/gpu/drm/i915/i915_gem.c
index 85231d1c39c3c9a016be846d74bbe3426895afc0..000a764ee8d90ff2fe0cb21c1c7d2b8bf25cc0f1 100644
(file)
--- 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;