Quoting Michał Winiarski (2018-06-11 09:57:26)
> On Sat, Jun 09, 2018 at 12:10:58PM +0100, Chris Wilson wrote:
> > Due to a silent conflict (silent because we are trying to fix the CI
> > test that is meant to exercising these failures!) between commit
> > 51e645b6652c ("drm/i915: Mark the GPU as wedged without error on fault
> > injection") and commit 8571a05a9dd0 ("drm/i915: Use GEM suspend when
> > aborting initialisation"), we failed to actually squash the error
> > message after injecting the load failure.
> >
> > Rearrange the code to export i915_load_failure() for better logging of
> > real errors (and quiet logging of injected errors).
> >
> > Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
> > Cc: Michał Winiarski <michal.winiarski@xxxxxxxxx>
>
> Reviewed-by: Michał Winiarski <michal.winiarski@xxxxxxxxx>
Thankyou, let's hope this time it sticks!
Applied, will push later on.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
