Daniel Vetter <daniel.vetter@xxxxxxxx> writes:
> This seems to have been accidentally lost in
>
> commit be62acb4cce1389a28296852737e3917d9cc5b25
> Author: Mika Kuoppala <mika.kuoppala@xxxxxxxxxxxxxxx>
> Date: Fri Aug 30 16:19:28 2013 +0300
>
> drm/i915: ban badly behaving contexts
>
> Without this real gpu hangs only log output at info level, which gets
> filtered away by piglit's testrunner.
>
> v2: Tune down to notice level. Note that we need to add drm/i915 so
> that at least the automatic igt dmesg filtering still picks it up.
>
> v3: git add and lack of coffee don't mix well.
>
> v4: Message is in between hw and sw reset, so switch verb to
> continuous form.
>
> v5: Use i915_stop_rings_allow_warn for consistency. For Chris' case of
> injecting lots of hangs I guess we need to revamp this all anyway when
> merging. For now this should plug the regression for piglit testing
> mesa.
>
> Cc: Mika Kuoppala <mika.kuoppala@xxxxxxxxx>
> Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
> Cc: Kenneth Graunke <kenneth@xxxxxxxxxxxxx>
> Reported-by: Kenneth Graunke <kenneth@xxxxxxxxxxxxx>
> Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/i915_drv.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index ea93ff151a74..fec4afe526c7 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -844,6 +844,9 @@ int i915_reset(struct drm_device *dev)
> }
> }
>
> + if (i915_stop_rings_allow_warn(dev_priv))
> + pr_notice("drm/i915: Resetting chip after gpu hang\n");
> +
I would have added also:
"As of now, further functionality or performance testing beyond this point is
utterly pointless."
Perhaps in caps.
-Mika
> if (ret) {
> DRM_ERROR("Failed to reset chip: %i\n", ret);
> mutex_unlock(&dev->struct_mutex);
> --
> 2.1.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
