| Message ID | 1423510402-12605-17-git-send-email-damien.lespiau@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 09/02/2015 19:33, Damien Lespiau wrote: > Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> Reviewed-by: Nick Hoath <nicholas.hoath@intel.com> > --- > drivers/gpu/drm/i915/i915_reg.h | 3 +++ > drivers/gpu/drm/i915/intel_pm.c | 7 ++++++- > 2 files changed, 9 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index b363c5e..610fcd4 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -5236,6 +5236,9 @@ enum skl_disp_power_wells { > #define HSW_NDE_RSTWRN_OPT 0x46408 > #define RESET_PCH_HANDSHAKE_ENABLE (1<<4) > > +#define FF_SLICE_CS_CHICKEN2 0x02e4 > +#define GEN9_TSG_BARRIER_ACK_DISABLE (1<<8) > + > /* GEN7 chicken */ > #define GEN7_COMMON_SLICE_CHICKEN1 0x7010 > # define GEN7_CSC1_RHWO_OPT_DISABLE_IN_RCC ((1<<10) | (1<<26)) > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index 8f9149b..6254102 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -81,11 +81,16 @@ static void skl_init_clock_gating(struct drm_device *dev) > GEN6_VFUNIT_CLOCK_GATE_DISABLE); > } > > - if (INTEL_REVID(dev) <= SKL_REVID_D0) > + if (INTEL_REVID(dev) <= SKL_REVID_D0) { > /* WaDisableHDCInvalidation:skl */ > I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) | > BDW_DISABLE_HDC_INVALIDATION); > > + /* WaDisableChickenBitTSGBarrierAckForFFSliceCS:skl */ > + I915_WRITE(FF_SLICE_CS_CHICKEN2, > + I915_READ(FF_SLICE_CS_CHICKEN2) | > + GEN9_TSG_BARRIER_ACK_DISABLE); > + } > > if (INTEL_REVID(dev) <= SKL_REVID_E0) > /* WaDisableLSQCROPERFforOCL:skl */ >
On Wed, Feb 11, 2015 at 03:42:16PM +0000, Nick Hoath wrote: > On 09/02/2015 19:33, Damien Lespiau wrote: > >Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> > > Reviewed-by: Nick Hoath <nicholas.hoath@intel.com> Merged all the ones Nick has reviewd already. Thanks, Daniel
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index b363c5e..610fcd4 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -5236,6 +5236,9 @@ enum skl_disp_power_wells { #define HSW_NDE_RSTWRN_OPT 0x46408 #define RESET_PCH_HANDSHAKE_ENABLE (1<<4) +#define FF_SLICE_CS_CHICKEN2 0x02e4 +#define GEN9_TSG_BARRIER_ACK_DISABLE (1<<8) + /* GEN7 chicken */ #define GEN7_COMMON_SLICE_CHICKEN1 0x7010 # define GEN7_CSC1_RHWO_OPT_DISABLE_IN_RCC ((1<<10) | (1<<26)) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 8f9149b..6254102 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -81,11 +81,16 @@ static void skl_init_clock_gating(struct drm_device *dev) GEN6_VFUNIT_CLOCK_GATE_DISABLE); } - if (INTEL_REVID(dev) <= SKL_REVID_D0) + if (INTEL_REVID(dev) <= SKL_REVID_D0) { /* WaDisableHDCInvalidation:skl */ I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) | BDW_DISABLE_HDC_INVALIDATION); + /* WaDisableChickenBitTSGBarrierAckForFFSliceCS:skl */ + I915_WRITE(FF_SLICE_CS_CHICKEN2, + I915_READ(FF_SLICE_CS_CHICKEN2) | + GEN9_TSG_BARRIER_ACK_DISABLE); + } if (INTEL_REVID(dev) <= SKL_REVID_E0) /* WaDisableLSQCROPERFforOCL:skl */
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> --- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_pm.c | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-)