]> asedeno.scripts.mit.edu Git - linux.git/commit
drm/i915: Fixup preempt-to-busy vs resubmission of a virtual request
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 23 Sep 2019 15:28:42 +0000 (16:28 +0100)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Wed, 16 Oct 2019 17:57:33 +0000 (10:57 -0700)
commit0a544a2a728e2e33bb7fc38dd542ecb90ee393eb
tree588e5ae173a444d5654d7912f466818bcecd78ef
parent4f2a572eda67aecb1e7e4fc26cc985fb8158f6e8
drm/i915: Fixup preempt-to-busy vs resubmission of a virtual request

As preempt-to-busy leaves the request on the HW as the resubmission is
processed, that request may complete in the background and even cause a
second virtual request to enter queue. This second virtual request
breaks our "single request in the virtual pipeline" assumptions.
Furthermore, as the virtual request may be completed and retired, we
lose the reference the virtual engine assumes is held. Normally, just
removing the request from the scheduler queue removes it from the
engine, but the virtual engine keeps track of its singleton request via
its ve->request. This pointer needs protecting with a reference.

v2: Drop unnecessary motion of rq->engine = owner

Fixes: 22b7a426bbe1 ("drm/i915/execlists: Preempt-to-busy")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190923152844.8914-1-chris@chris-wilson.co.uk
(cherry picked from commit b647c7df01b75761b4c0b1cb6f4841088c0b1121)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/gt/intel_lrc.c