OSDN Git Service

drm/i915: Ironlake do_idle_maps w/a may be called w/o struct_mutex
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 30 Mar 2017 08:53:41 +0000 (09:53 +0100)
committerJani Nikula <jani.nikula@intel.com>
Fri, 31 Mar 2017 10:40:02 +0000 (13:40 +0300)
commit1383aeca92b72f4179420820c3a64dfb5909cc97
tree0cd3122fe4041fb5687b4cddf425e82ffc8e72ea
parent9ba2a6261de49588714a25f49db80bbe961b870a
drm/i915: Ironlake do_idle_maps w/a may be called w/o struct_mutex

Since commit 1233e2db199d ("drm/i915: Move object backing storage
manipulation to its own locking"), i915_gem_object_put_pages() and
specifically the i915_gem_gtt_finish_pages() may be called from outside
of the struct_mutex and so we can no longer pass I915_WAIT_LOCKED to
i915_gem_wait_for_idle.

Fixes: 1233e2db199d ("drm/i915: Move object backing storage manipulation to its own locking")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Cc: <stable@vger.kernel.org> # v4.10+
Link: http://patchwork.freedesktop.org/patch/msgid/20170330085341.20311-1-chris@chris-wilson.co.uk
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
(cherry picked from commit 228ec87ccd040b620c467cd61d594bfaa4f8a12e)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/i915_gem_gtt.c