drm/i915/execlists: Clear user-active flag on preemption completion
authorChris Wilson <chris@chris-wilson.co.uk>
Sat, 24 Mar 2018 12:58:29 +0000 (12:58 +0000)
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Wed, 4 Apr 2018 13:45:32 +0000 (16:45 +0300)
commit38057aa1639b74d5c1e0dc1ca7c22bc7a31de714
tree577ab02a7b4c035d739c1e2bc6ee9b559370f705
parentfbcc85974a49e9a6f3deb67fe3a0d4fb1af49983
drm/i915/execlists: Clear user-active flag on preemption completion

When cancelling the requests and clearing out the ports following a
successful preemption completion, also clear the active flag. I had
assumed that all preemptions would be followed by an immediate dequeue
(preserving the active user flag), but under rare circumstances we may
be triggering a preemption for the second port only for it to have
completed before the preemotion kicks in; leaving execlists->active set
even though the system is now idle.

We can clear the flag inside the common execlists_cancel_port_requests()
as the other users also expect the semantics of active being cleared.

Fixes: f6322eddaff7 ("drm/i915/preemption: Allow preemption between submission ports")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: MichaƂ Winiarski <michal.winiarski@intel.com>
Cc: Michel Thierry <michel.thierry@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180324125829.27026-1-chris@chris-wilson.co.uk
(cherry picked from commit eed7ec52f214bac2f25395ccaad610fbeb842a6e)
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
drivers/gpu/drm/i915/intel_lrc.c