[Intel-gfx] [PATCH] drm/i915/gt: Drop the duplicate workaround

Rodrigo Vivi rodrigo.vivi at intel.com
Thu Jul 11 00:40:38 UTC 2019


On Wed, Jul 10, 2019 at 09:04:28PM +0100, Chris Wilson wrote:
> The workarounds was revived in the backmerge that was meant to fix it!
> 
> Fixes: 88c90e800675 ("Merge drm/drm-next into drm-intel-next-queued")
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>

Duh! Sorry about that and thanks for dropping the fixup from drm-rerere.

I was hopping the backmerge + push would fail when applying the fixup
so I would remove it. Instead it went through my scripts silently to the
end... :(

> ---
>  drivers/gpu/drm/i915/gt/intel_workarounds.c | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> index f6fd6905ee6f..9e069286d3ce 100644
> --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
> +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> @@ -531,12 +531,6 @@ static void icl_ctx_workarounds_init(struct intel_engine_cs *engine,
>  {
>  	struct drm_i915_private *i915 = engine->i915;
>  
> -	/* WaDisableBankHangMode:icl */
> -	wa_write(wal,
> -		 GEN8_L3CNTLREG,
> -		 intel_uncore_read(engine->uncore, GEN8_L3CNTLREG) |
> -		 GEN8_ERRDETBCTRL);
> -
>  	/* WaDisableBankHangMode:icl */
>  	wa_write(wal,
>  		 GEN8_L3CNTLREG,
> -- 
> 2.22.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx


More information about the Intel-gfx mailing list