OSDN Git Service

drm/i915: Unwind failure on pinning the gen7 ppgtt
authorChris Wilson <chris@chris-wilson.co.uk>
Sat, 22 Dec 2018 03:06:23 +0000 (03:06 +0000)
committerJani Nikula <jani.nikula@intel.com>
Thu, 10 Jan 2019 13:09:51 +0000 (15:09 +0200)
commit280d479b310298dfeb1d6f9a1617eca37beb6ce4
tree94eaf592d15c0b3836f02624f7ddf052c2fec412
parent107c595c2a277be65b28762f12e1dad243e05623
drm/i915: Unwind failure on pinning the gen7 ppgtt

If we fail to pin the ggtt vma slot for the ppgtt page tables, we need
to unwind the locals before reporting the error. Or else on subsequent
attempts to bind the page tables into the ggtt, we will already believe
that the vma has been pinned and continue on blithely. If something else
should happen to be at that location, choas ensues.

Fixes: a2bbf7148342 ("drm/i915/gtt: Only keep gen6 page directories pinned while active")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Matthew Auld <matthew.william.auld@gmail.com>
Cc: <stable@vger.kernel.org> # v4.19+
Reviewed-by: Matthew Auld <matthew.william.auld@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181222030623.21710-1-chris@chris-wilson.co.uk
(cherry picked from commit d4de753526f4d99f541f1b6ed1d963005c09700c)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/i915_gem_gtt.c