[Intel-gfx] [PATCH 2/4] drm/i915/icl: add Wa_22010271021 for all gen11

[Matt Roper]

On Tue, Mar 02, 2021 at 05:07:26PM -0800, Lucas De Marchi wrote:
> From: Caz Yokoyama <caz.yokoyama at intel.com>
> 
> Wa_22010271021 does not apply only to EHL, but to all gen11 platforms.

It also applies to a bunch of gen12 platforms; we already apply the same
workaround in an earlier block of the same function too to handle all of
them.  It's fine to keep the gen11 and gen12 copies separate and prevent
even more complicated if/else chains in this function that's already
overly-complicated, but you should probably just drop the ":gen11"
suffix on the code comment and you may want to tweak the commit message
here to indicate that we already have this handled properly for all the
gen12 platforms.

Aside from that,

Reviewed-by: Matt Roper <matthew.d.roper at intel.com>

> 
> Bspec: 33450, 52887
> 
> Cc: Clinton Taylor <clinton.a.taylor at intel.com>
> Cc: Matt Roper <matthew.d.roper at intel.com>
> Signed-off-by: Caz Yokoyama <caz.yokoyama at intel.com>
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> ---
>  drivers/gpu/drm/i915/gt/intel_workarounds.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> index f6d9b849aa62..9e6e405aabac 100644
> --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
> +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> @@ -1820,11 +1820,10 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal)
>  			    GEN7_FF_THREAD_MODE,
>  			    GEN12_FF_TESSELATION_DOP_GATE_DISABLE);
>  
> -		/* Wa_22010271021:ehl */
> -		if (IS_JSL_EHL(i915))
> -			wa_masked_en(wal,
> -				     GEN9_CS_DEBUG_MODE1,
> -				     FF_DOP_CLOCK_GATE_DISABLE);
> +		/* Wa_22010271021:gen11 */
> +		wa_masked_en(wal,
> +			     GEN9_CS_DEBUG_MODE1,
> +			     FF_DOP_CLOCK_GATE_DISABLE);
>  	}
>  
>  	if (IS_GEN_RANGE(i915, 9, 12)) {
> -- 
> 2.30.1
> 

-- 
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795