diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2017-11-01 20:21:49 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-11-02 11:24:59 +0000 |
| commit | 820c5bbbf418fba41149fdeb870d623e21be2463 (patch) | |
| tree | 75084edd273e7c6fbb63c03dcb3e2d33e85052cc /drivers/gpu/drm/i915/intel_engine_cs.c | |
| parent | 7130630323c562597191653560963e61c5bd0f57 (diff) | |
drm/i915: Flush the irq and tasklets before asserting engine is idle
Before we assert that the engine is idle, make sure we flush any
residual tasklet. After that point, if the engine is not idle, more work
may be queued despite us trying to park the engine and go to sleep.
References: https://bugs.freedesktop.org/show_bug.cgi?id=103479
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171101202149.32493-1-chris@chris-wilson.co.uk
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_engine_cs.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_engine_cs.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c index 6895a90af008..ddbe5c9bf45a 100644 --- a/drivers/gpu/drm/i915/intel_engine_cs.c +++ b/drivers/gpu/drm/i915/intel_engine_cs.c @@ -1614,6 +1614,10 @@ void intel_engines_park(struct drm_i915_private *i915) enum intel_engine_id id; for_each_engine(engine, i915, id) { + /* Flush the residual irq tasklets first. */ + intel_engine_disarm_breadcrumbs(engine); + tasklet_kill(&engine->execlists.irq_tasklet); + /* * We are committed now to parking the engines, make sure there * will be no more interrupts arriving later and the engines @@ -1630,9 +1634,6 @@ void intel_engines_park(struct drm_i915_private *i915) if (engine->park) engine->park(engine); - intel_engine_disarm_breadcrumbs(engine); - tasklet_kill(&engine->execlists.irq_tasklet); - i915_gem_batch_pool_fini(&engine->batch_pool); engine->execlists.no_priolist = false; } |