]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
drm/i915/gt: Pin the rings before marking active
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 6 Jul 2020 17:01:38 +0000 (18:01 +0100)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Wed, 8 Jul 2020 01:00:15 +0000 (18:00 -0700)
commit5a383d443b29a140094430f3ad1d02fa1acc2b80
treefed8ee32effc5945a2eafff72c4f52f8d3690f4b
parentcf1976b11372cac3b57fbae1831f66a4486355d3
drm/i915/gt: Pin the rings before marking active

On eviction, we acquire the vm->mutex and then wait on the vma->active.
Therefore when binding and pinning the vma, we must follow the same
sequence, lock/pin the vma then mark it active. Otherwise, we mark the
vma as active, then wait for the vm->mutex, and meanwhile the evictor
holding the mutex waits upon us to complete our activity.

Fixes: 8ccfc20a7d56 ("drm/i915/gt: Mark ring->vma as active while pinned")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: <stable@vger.kernel.org> # v5.6+
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200706170138.8993-1-chris@chris-wilson.co.uk
(cherry picked from commit 8567774e87e23a57155e5102f81208729b992ae6)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/gt/intel_context.c