[Intel-gfx] [PATCH] drm/i915/kbl: Remove WaDisableKillLogic and GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC

[Ville Syrjälä]

On Fri, Jun 16, 2017 at 04:43:41PM -0700, Rodrigo Vivi wrote:
> When reviewing commit 46c26662d2f ("drm/i915/cfl: Introduce Coffee Lake workarounds.")
> Mika pointed out that Spec tells those 2 workarounds were not needed.
> 
> So when double checking I confirmed that and also that by Spec they don't apply
> to Kabylake as well.
> 
> Cc: Mika Kuoppala <mika.kuoppala at intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_engine_cs.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
> index a4487c5..2c29bab 100644
> --- a/drivers/gpu/drm/i915/intel_engine_cs.c
> +++ b/drivers/gpu/drm/i915/intel_engine_cs.c
> @@ -831,8 +831,8 @@ static int gen9_init_workarounds(struct intel_engine_cs *engine)
>  			  FLOW_CONTROL_ENABLE |
>  			  PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE);
>  
> -	/* Syncing dependencies between camera and graphics:skl,bxt,kbl */
> -	if (!IS_COFFEELAKE(dev_priv))
> +	/* Syncing dependencies between camera and graphics:skl,bxt */
> +	if (!IS_COFFEELAKE(dev_priv) && !IS_KABYLAKE(dev_priv))
>  		WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
>  				  GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC);
>  
> @@ -894,8 +894,8 @@ static int gen9_init_workarounds(struct intel_engine_cs *engine)
>  	WA_SET_BIT_MASKED(HDC_CHICKEN0,
>  			  HDC_FORCE_NON_COHERENT);
>  
> -	/* WaDisableHDCInvalidation:skl,bxt,kbl */
> -	if (!IS_COFFEELAKE(dev_priv))
> +	/* WaDisableHDCInvalidation:skl,bxt */
> +	if (!IS_COFFEELAKE(dev_priv) && !IS_KABYLAKE(dev_priv))
>  		I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
>  			   BDW_DISABLE_HDC_INVALIDATION);

IMO you should just move these to the skl/bxt/glk code.

-- 
Ville Syrjälä
Intel OTC