diff options
| author | Chris Wilson | 2017-03-30 16:50:37 +0200 |
|---|---|---|
| committer | Chris Wilson | 2017-03-30 18:58:44 +0200 |
| commit | 8490ae207f1d1dd6765e89dd7c189c2c975ee3bc (patch) | |
| tree | e8d3b217ff74181d3b856c30d8caf641f5be65fe /drivers/gpu/drm/i915/intel_engine_cs.c | |
| parent | drm/i915: Do request retirement before marking engines as wedged (diff) | |
| download | kernel-qcow2-linux-8490ae207f1d1dd6765e89dd7c189c2c975ee3bc.tar.gz kernel-qcow2-linux-8490ae207f1d1dd6765e89dd7c189c2c975ee3bc.tar.xz kernel-qcow2-linux-8490ae207f1d1dd6765e89dd7c189c2c975ee3bc.zip | |
drm/i915: Suppress busy status for engines if wedged
If the driver is wedged, HW state may be very inconsistent and
report that it is still busy, even though we have stopped using it. This
can lead to a double *ERROR* rather than a graceful cleanup after
wedging.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170330145041.9005-2-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/intel_engine_cs.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_engine_cs.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c index 1fb97e8401de..854e8e0c836b 100644 --- a/drivers/gpu/drm/i915/intel_engine_cs.c +++ b/drivers/gpu/drm/i915/intel_engine_cs.c @@ -1111,6 +1111,15 @@ bool intel_engines_are_idle(struct drm_i915_private *dev_priv) struct intel_engine_cs *engine; enum intel_engine_id id; + if (READ_ONCE(dev_priv->gt.active_requests)) + return false; + + /* If the driver is wedged, HW state may be very inconsistent and + * report that it is still busy, even though we have stopped using it. + */ + if (i915_terminally_wedged(&dev_priv->gpu_error)) + return true; + for_each_engine(engine, dev_priv, id) { if (!intel_engine_is_idle(engine)) return false; |