[Intel-gfx] [PATCH] drm/i915: Extend Haswell GT1 PSMI workaround to all

[Mika Kuoppala]

Chris Wilson <chris at chris-wilson.co.uk> writes:

> A few times in CI, we have detected a GPU hang on our Haswell GT2
> systems with the characteristic IPEHR of 0x780c0000. When the PSMI w/a
> was first introducted, it was applied to all Haswell, but later on we
> found an erratum that supposedly restricted the issue to GT1 and so
> constrained it only be applied on GT1. That may have been a mistake...
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111692
> Fixes: 167bc759e823 ("drm/i915: Restrict PSMI context load w/a to Haswell GT1")
> References: 2c550183476d ("drm/i915: Disable PSMI sleep messages on all rings around context switches")
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala at linux.intel.com>

I see no harm of extending the umbrella disabling sleep
so,

Acked-by: Mika Kuoppala <mika.kuoppala at linux.intel.com>


> ---
>  drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
> index a73296e6b13d..a25b84b12ef1 100644
> --- a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
> @@ -1574,7 +1574,7 @@ static inline int mi_set_context(struct i915_request *rq, u32 flags)
>  	struct intel_engine_cs *engine = rq->engine;
>  	enum intel_engine_id id;
>  	const int num_engines =
> -		IS_HSW_GT1(i915) ? RUNTIME_INFO(i915)->num_engines - 1 : 0;
> +		IS_HASWELL(i915) ? RUNTIME_INFO(i915)->num_engines - 1 : 0;
>  	bool force_restore = false;
>  	int len;
>  	u32 *cs;
> -- 
> 2.23.0