Re: [Intel-gfx] [PATCH 11/11] drm/i915/icl: Wa_1406463099

2018-05-29 Thread Mika Kuoppala
Oscar Mateo  writes:

> Prevents an error in the GAM unit. Also known as WaGamTlbPendError
>
> References: HSDES#1406463099
> References: HSDES#1406465643
> Signed-off-by: Oscar Mateo 

Reviewed-by: Mika Kuoppala 

> ---
>  drivers/gpu/drm/i915/i915_reg.h  | 5 +++--
>  drivers/gpu/drm/i915/intel_workarounds.c | 7 +++
>  2 files changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 42835d79..8a18447 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -2306,8 +2306,9 @@ enum i915_power_well_id {
>  #define   GAMW_ECO_ENABLE_64K_IPS_FIELD 0xF
>  
>  #define GAMT_CHKN_BIT_REG_MMIO(0x4ab8)
> -#define   GAMT_CHKN_DISABLE_DYNAMIC_CREDIT_SHARING   (1<<28)
> -#define   GAMT_CHKN_DISABLE_I2M_CYCLE_ON_WR_PORT (1<<24)
> +#define   GAMT_CHKN_DISABLE_L3_COH_PIPE  (1 << 31)
> +#define   GAMT_CHKN_DISABLE_DYNAMIC_CREDIT_SHARING   (1 << 28)
> +#define   GAMT_CHKN_DISABLE_I2M_CYCLE_ON_WR_PORT (1 << 24)
>  
>  #if 0
>  #define PRB0_TAIL_MMIO(0x2030)
> diff --git a/drivers/gpu/drm/i915/intel_workarounds.c 
> b/drivers/gpu/drm/i915/intel_workarounds.c
> index 474e498..77929df 100644
> --- a/drivers/gpu/drm/i915/intel_workarounds.c
> +++ b/drivers/gpu/drm/i915/intel_workarounds.c
> @@ -859,6 +859,13 @@ static void icl_gt_workarounds_apply(struct 
> drm_i915_private *dev_priv)
>  PMFLUSHDONE_LNICRSDROP |
>  PMFLUSH_GAPL3UNBLOCK |
>  PMFLUSHDONE_LNEBLK);
> +
> + /* Wa_1406463099:icl
> +  * Formerly known as WaGamTlbPendError
> +  */
> + I915_WRITE(GAMT_CHKN_BIT_REG,
> +I915_READ(GAMT_CHKN_BIT_REG) |
> +GAMT_CHKN_DISABLE_L3_COH_PIPE);
>  }
>  
>  void intel_gt_workarounds_apply(struct drm_i915_private *dev_priv)
> -- 
> 1.9.1
>
> ___
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx


[Intel-gfx] [PATCH 11/11] drm/i915/icl: Wa_1406463099

2018-05-25 Thread Oscar Mateo
Prevents an error in the GAM unit. Also known as WaGamTlbPendError

References: HSDES#1406463099
References: HSDES#1406465643
Signed-off-by: Oscar Mateo 
---
 drivers/gpu/drm/i915/i915_reg.h  | 5 +++--
 drivers/gpu/drm/i915/intel_workarounds.c | 7 +++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 42835d79..8a18447 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -2306,8 +2306,9 @@ enum i915_power_well_id {
 #define   GAMW_ECO_ENABLE_64K_IPS_FIELD 0xF
 
 #define GAMT_CHKN_BIT_REG  _MMIO(0x4ab8)
-#define   GAMT_CHKN_DISABLE_DYNAMIC_CREDIT_SHARING (1<<28)
-#define   GAMT_CHKN_DISABLE_I2M_CYCLE_ON_WR_PORT   (1<<24)
+#define   GAMT_CHKN_DISABLE_L3_COH_PIPE(1 << 31)
+#define   GAMT_CHKN_DISABLE_DYNAMIC_CREDIT_SHARING (1 << 28)
+#define   GAMT_CHKN_DISABLE_I2M_CYCLE_ON_WR_PORT   (1 << 24)
 
 #if 0
 #define PRB0_TAIL  _MMIO(0x2030)
diff --git a/drivers/gpu/drm/i915/intel_workarounds.c 
b/drivers/gpu/drm/i915/intel_workarounds.c
index 474e498..77929df 100644
--- a/drivers/gpu/drm/i915/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/intel_workarounds.c
@@ -859,6 +859,13 @@ static void icl_gt_workarounds_apply(struct 
drm_i915_private *dev_priv)
   PMFLUSHDONE_LNICRSDROP |
   PMFLUSH_GAPL3UNBLOCK |
   PMFLUSHDONE_LNEBLK);
+
+   /* Wa_1406463099:icl
+* Formerly known as WaGamTlbPendError
+*/
+   I915_WRITE(GAMT_CHKN_BIT_REG,
+  I915_READ(GAMT_CHKN_BIT_REG) |
+  GAMT_CHKN_DISABLE_L3_COH_PIPE);
 }
 
 void intel_gt_workarounds_apply(struct drm_i915_private *dev_priv)
-- 
1.9.1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx