Chris Wilson <ch...@chris-wilson.co.uk> writes: > If we fail to reset the GPU (i915_reset()), we do one final > intel_gpu_reset() attempt as we mark the device wedged. The idea here is > even though the GPU has proven unreliable (and so we want to stop using > it for the time being), we don't want it spinning away in the background > whilst the driver idles so we try to reset it one more time. However, we > want to dump the i915_gem_set_wedged() debugging info before we do, so > that we can see the accurate state of the GPU when it failed. > > Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> > Cc: Mika Kuoppala <mika.kuopp...@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuopp...@linux.intel.com> > --- > drivers/gpu/drm/i915/i915_drv.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index cd57f946cf45..3ca3ce1e7359 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -1920,7 +1920,6 @@ void i915_reset(struct drm_i915_private *i915, unsigned > int flags) > ret = i915_gem_reset_prepare(i915); > if (ret) { > dev_err(i915->drm.dev, "GPU recovery failed\n"); > - intel_gpu_reset(i915, ALL_ENGINES); > goto taint; > } > > @@ -2003,6 +2002,7 @@ void i915_reset(struct drm_i915_private *i915, unsigned > int flags) > error: > i915_gem_set_wedged(i915); > i915_gem_retire_requests(i915); > + intel_gpu_reset(i915, ALL_ENGINES); > goto finish; > } > > -- > 2.16.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx