]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Check activity on i915_vma after confirming pin_count==0
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 23 Jan 2020 22:44:58 +0000 (22:44 +0000)
committerJani Nikula <jani.nikula@intel.com>
Tue, 11 Feb 2020 09:49:51 +0000 (11:49 +0200)
commita2c98e7e83d755c49b759748d7e73b2c8e3fada7
treeaceac3f7217d6debed9ac1a4d2b4abf4978bcf2a
parente19da25cd88a842f883f22609e5a2ba59e484790
drm/i915: Check activity on i915_vma after confirming pin_count==0

Only assert that the i915_vma is now idle if and only if no other pins
are present. If another user has the i915_vma pinned, they may submit
more work to the i915_vma skipping the vm->mutex used to serialise the
unbind. We need to wait again, if we want to continue and unbind this
vma.

However, if we own the i915_vma (we hold the vm->mutex for the unbind
and the pin_count is 0), we can assert that the vma remains idle as we
unbind.

Fixes: dc2b06adfaf3 ("drm/i915: Pull i915_vma_pin under the vm->mutex")
Closes: https://gitlab.freedesktop.org/drm/intel/issues/530
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200123224459.38128-1-chris@chris-wilson.co.uk
(cherry picked from commit 60e94557fff1f5514c7fc4da7ddc2c7a13ffff26)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/i915_vma.c