[Intel-gfx] [PATCH 1/6] drm/i915: Define explicit wedged on init reset state

Chris Wilson chris at chris-wilson.co.uk
Thu Sep 26 10:20:58 UTC 2019


Quoting Michał Winiarski (2019-09-26 11:06:30)
> We're currently using scratch presence as a way of identifying that we
> entered wedged state at driver initialization time.
> Let's use a separate flag rather than rely on scratch.
> 
> Signed-off-by: Michał Winiarski <michal.winiarski at intel.com>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/gt/intel_reset.c       | 11 ++++++++++-
>  drivers/gpu/drm/i915/gt/intel_reset.h       |  9 +++++++++
>  drivers/gpu/drm/i915/gt/intel_reset_types.h |  6 ++++++
>  drivers/gpu/drm/i915/i915_gem.c             |  2 +-
>  4 files changed, 26 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
> index ae68c3786f63..0f1534ac823f 100644
> --- a/drivers/gpu/drm/i915/gt/intel_reset.c
> +++ b/drivers/gpu/drm/i915/gt/intel_reset.c
> @@ -811,7 +811,8 @@ static bool __intel_gt_unset_wedged(struct intel_gt *gt)
>         if (!test_bit(I915_WEDGED, &gt->reset.flags))
>                 return true;
>  
> -       if (!gt->scratch) /* Never full initialised, recovery impossible */
> +       /* Never fullly initialised, recovery impossible */

You went one 'l' too far in the correction.

Ok, hard to argue against.
Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
-Chris


More information about the Intel-gfx mailing list