drm/i915/execlists: Move the assertion we have the rpm wakeref down
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 19 Jul 2018 07:50:29 +0000 (08:50 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Thu, 19 Jul 2018 12:23:43 +0000 (13:23 +0100)
commitd78d3343dce7787a5f7fd0b3d522a3510fd26ef9
tree2e89e8b000abf81e2dee1a1481153273817dbfb8
parent46b1063f91e5680eff2a6b9fe432f6aae3bef54e
drm/i915/execlists: Move the assertion we have the rpm wakeref down

There's a race between idling the engine and finishing off the last
tasklet (as we may kick the tasklets after declaring an individual
engine idle). However, since we do not need to access the device until
we try to submit to the ELSP register (processing the CSB just requires
normal CPU access to the HWSP, and when idle we should not need to
submit!) we can defer the assertion unto that point. The assertion is
still useful as it does verify that we do hold the longterm GT wakeref
taken from request allocation until request completion.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107274
Fixes: 9512f985c32d ("drm/i915/execlists: Direct submission of new requests (avoid tasklet/ksoftirqd)")
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/20180719075029.28643-1-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/intel_lrc.c