* [PATCH] drm/i915: Remove WaDisableKillLogic and GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC for KBL and GLK.
@ 2017-06-19 17:23 Rodrigo Vivi
2017-06-19 17:46 ` ✓ Fi.CI.BAT: success for " Patchwork
2017-06-19 18:22 ` [PATCH] " Ville Syrjälä
0 siblings, 2 replies; 5+ messages in thread
From: Rodrigo Vivi @ 2017-06-19 17:23 UTC (permalink / raw)
To: intel-gfx; +Cc: Ander Conselvan de Oliveira, Mika Kuoppala, Rodrigo Vivi
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 only apply to SKL and BXT.
v2: Instead of increase the if/else move the wa
to individual platform functions. (Ville).
Also remove from GLK since spec only mentions SKL and BXT.
Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
drivers/gpu/drm/i915/intel_engine_cs.c | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
index a4487c5..33c3a9d 100644
--- a/drivers/gpu/drm/i915/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/intel_engine_cs.c
@@ -831,11 +831,6 @@ 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))
- WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
- GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC);
-
/* WaDisableDgMirrorFixInHalfSliceChicken5:bxt */
if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1))
WA_CLR_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN5,
@@ -894,11 +889,6 @@ 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))
- I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
- BDW_DISABLE_HDC_INVALIDATION);
-
/* WaDisableSamplerPowerBypassForSOPingPong:skl,bxt,kbl,cfl */
if (IS_SKYLAKE(dev_priv) ||
IS_KABYLAKE(dev_priv) ||
@@ -1007,6 +997,14 @@ static int skl_init_workarounds(struct intel_engine_cs *engine)
if (ret)
return ret;
+ /* Syncing dependencies between camera and graphics:skl */
+ WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
+ GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC);
+
+ /* WaDisableHDCInvalidation:skl */
+ I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
+ BDW_DISABLE_HDC_INVALIDATION);
+
return skl_tune_iz_hashing(engine);
}
@@ -1076,6 +1074,14 @@ static int bxt_init_workarounds(struct intel_engine_cs *engine)
WA_SET_BIT(GEN9_GAMT_ECO_REG_RW_IA,
GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);
+ /* Syncing dependencies between camera and graphics:bxt */
+ WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
+ GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC);
+
+ /* WaDisableHDCInvalidation:bxt */
+ I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
+ BDW_DISABLE_HDC_INVALIDATION);
+
return 0;
}
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Remove WaDisableKillLogic and GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC for KBL and GLK.
2017-06-19 17:23 [PATCH] drm/i915: Remove WaDisableKillLogic and GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC for KBL and GLK Rodrigo Vivi
@ 2017-06-19 17:46 ` Patchwork
2017-06-19 18:22 ` [PATCH] " Ville Syrjälä
1 sibling, 0 replies; 5+ messages in thread
From: Patchwork @ 2017-06-19 17:46 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Remove WaDisableKillLogic and GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC for KBL and GLK.
URL : https://patchwork.freedesktop.org/series/26001/
State : success
== Summary ==
Series 26001v1 drm/i915: Remove WaDisableKillLogic and GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC for KBL and GLK.
https://patchwork.freedesktop.org/api/1.0/series/26001/revisions/1/mbox/
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-atomic:
fail -> PASS (fi-snb-2600) fdo#100215
fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:462s
fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:480s
fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time:585s
fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:557s
fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:490s
fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:486s
fi-glk-2a total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:580s
fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:432s
fi-hsw-4770r total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:16 time:413s
fi-ilk-650 total:278 pass:227 dwarn:0 dfail:0 fail:0 skip:50 time:465s
fi-ivb-3520m total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:18 time:495s
fi-ivb-3770 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:18 time:520s
fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:473s
fi-kbl-7560u total:278 pass:267 dwarn:1 dfail:0 fail:0 skip:10 time:568s
fi-kbl-r total:278 pass:259 dwarn:1 dfail:0 fail:0 skip:18 time:581s
fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:474s
fi-skl-6700hq total:278 pass:228 dwarn:1 dfail:0 fail:27 skip:22 time:433s
fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:513s
fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:508s
fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:509s
fi-snb-2520m total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:28 time:620s
fi-snb-2600 total:278 pass:247 dwarn:0 dfail:0 fail:1 skip:29 time:408s
508325c380d12aaccd410adc935e24f70acf69a8 drm-tip: 2017y-06m-19d-09h-05m-32s UTC integration manifest
0fce103 drm/i915: Remove WaDisableKillLogic and GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC for KBL and GLK.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4987/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: Remove WaDisableKillLogic and GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC for KBL and GLK.
2017-06-19 17:23 [PATCH] drm/i915: Remove WaDisableKillLogic and GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC for KBL and GLK Rodrigo Vivi
2017-06-19 17:46 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2017-06-19 18:22 ` Ville Syrjälä
2017-06-19 19:01 ` Vivi, Rodrigo
1 sibling, 1 reply; 5+ messages in thread
From: Ville Syrjälä @ 2017-06-19 18:22 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: Ander Conselvan de Oliveira, intel-gfx, Mika Kuoppala
On Mon, Jun 19, 2017 at 10:23:41AM -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 only apply to SKL and BXT.
>
> v2: Instead of increase the if/else move the wa
> to individual platform functions. (Ville).
> Also remove from GLK since spec only mentions SKL and BXT.
The spec seems to be telling me that these shouldn't needed on any
platform. But there are scary comments in the code saying that they
have been kept to cure some hangs. Probably best to wair for Mika to be
back to review this one.
>
> Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Mika Kuoppala <mika.kuoppala@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/i915/intel_engine_cs.c | 26 ++++++++++++++++----------
> 1 file changed, 16 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
> index a4487c5..33c3a9d 100644
> --- a/drivers/gpu/drm/i915/intel_engine_cs.c
> +++ b/drivers/gpu/drm/i915/intel_engine_cs.c
> @@ -831,11 +831,6 @@ 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))
> - WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
> - GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC);
> -
> /* WaDisableDgMirrorFixInHalfSliceChicken5:bxt */
> if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1))
> WA_CLR_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN5,
> @@ -894,11 +889,6 @@ 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))
> - I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
> - BDW_DISABLE_HDC_INVALIDATION);
> -
> /* WaDisableSamplerPowerBypassForSOPingPong:skl,bxt,kbl,cfl */
> if (IS_SKYLAKE(dev_priv) ||
> IS_KABYLAKE(dev_priv) ||
> @@ -1007,6 +997,14 @@ static int skl_init_workarounds(struct intel_engine_cs *engine)
> if (ret)
> return ret;
>
> + /* Syncing dependencies between camera and graphics:skl */
> + WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
> + GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC);
> +
> + /* WaDisableHDCInvalidation:skl */
> + I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
> + BDW_DISABLE_HDC_INVALIDATION);
> +
> return skl_tune_iz_hashing(engine);
> }
>
> @@ -1076,6 +1074,14 @@ static int bxt_init_workarounds(struct intel_engine_cs *engine)
> WA_SET_BIT(GEN9_GAMT_ECO_REG_RW_IA,
> GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);
>
> + /* Syncing dependencies between camera and graphics:bxt */
> + WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
> + GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC);
> +
> + /* WaDisableHDCInvalidation:bxt */
> + I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
> + BDW_DISABLE_HDC_INVALIDATION);
> +
> return 0;
> }
>
> --
> 1.9.1
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: Remove WaDisableKillLogic and GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC for KBL and GLK.
2017-06-19 18:22 ` [PATCH] " Ville Syrjälä
@ 2017-06-19 19:01 ` Vivi, Rodrigo
2017-06-19 19:17 ` Ville Syrjälä
0 siblings, 1 reply; 5+ messages in thread
From: Vivi, Rodrigo @ 2017-06-19 19:01 UTC (permalink / raw)
To: ville.syrjala@linux.intel.com
Cc: Conselvan De Oliveira, Ander, intel-gfx@lists.freedesktop.org,
Kuoppala, Mika
On Mon, 2017-06-19 at 21:22 +0300, Ville Syrjälä wrote:
> On Mon, Jun 19, 2017 at 10:23:41AM -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 only apply to SKL and BXT.
> >
> > v2: Instead of increase the if/else move the wa
> > to individual platform functions. (Ville).
> > Also remove from GLK since spec only mentions SKL and BXT.
>
> The spec seems to be telling me that these shouldn't needed on any
> platform. But there are scary comments in the code saying that they
> have been kept to cure some hangs. Probably best to wair for Mika to be
> back to review this one.
About WaDisableKillLogic:
Bspec: Gen 9 Workarounds:
#0684 3D WaDisableKillLogic - SKL and BXT.
About the other one:
GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC...
Fun, but it is not in the spec anymore indeed. If you search for e184
gen9 workarounds page is listed, but it is not mentioned anymore.
Mika and I indeed saw that there at some point for SKL at least, but not
for others..
not sure!
>
> >
> > Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > Cc: Mika Kuoppala <mika.kuoppala@intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> > drivers/gpu/drm/i915/intel_engine_cs.c | 26 ++++++++++++++++----------
> > 1 file changed, 16 insertions(+), 10 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
> > index a4487c5..33c3a9d 100644
> > --- a/drivers/gpu/drm/i915/intel_engine_cs.c
> > +++ b/drivers/gpu/drm/i915/intel_engine_cs.c
> > @@ -831,11 +831,6 @@ 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))
> > - WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
> > - GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC);
> > -
> > /* WaDisableDgMirrorFixInHalfSliceChicken5:bxt */
> > if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1))
> > WA_CLR_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN5,
> > @@ -894,11 +889,6 @@ 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))
> > - I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
> > - BDW_DISABLE_HDC_INVALIDATION);
> > -
> > /* WaDisableSamplerPowerBypassForSOPingPong:skl,bxt,kbl,cfl */
> > if (IS_SKYLAKE(dev_priv) ||
> > IS_KABYLAKE(dev_priv) ||
> > @@ -1007,6 +997,14 @@ static int skl_init_workarounds(struct intel_engine_cs *engine)
> > if (ret)
> > return ret;
> >
> > + /* Syncing dependencies between camera and graphics:skl */
> > + WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
> > + GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC);
> > +
> > + /* WaDisableHDCInvalidation:skl */
> > + I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
> > + BDW_DISABLE_HDC_INVALIDATION);
> > +
> > return skl_tune_iz_hashing(engine);
> > }
> >
> > @@ -1076,6 +1074,14 @@ static int bxt_init_workarounds(struct intel_engine_cs *engine)
> > WA_SET_BIT(GEN9_GAMT_ECO_REG_RW_IA,
> > GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);
> >
> > + /* Syncing dependencies between camera and graphics:bxt */
> > + WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
> > + GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC);
> > +
> > + /* WaDisableHDCInvalidation:bxt */
> > + I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
> > + BDW_DISABLE_HDC_INVALIDATION);
> > +
> > return 0;
> > }
> >
> > --
> > 1.9.1
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: Remove WaDisableKillLogic and GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC for KBL and GLK.
2017-06-19 19:01 ` Vivi, Rodrigo
@ 2017-06-19 19:17 ` Ville Syrjälä
0 siblings, 0 replies; 5+ messages in thread
From: Ville Syrjälä @ 2017-06-19 19:17 UTC (permalink / raw)
To: Vivi, Rodrigo
Cc: Conselvan De Oliveira, Ander, intel-gfx@lists.freedesktop.org,
Kuoppala, Mika
On Mon, Jun 19, 2017 at 07:01:21PM +0000, Vivi, Rodrigo wrote:
> On Mon, 2017-06-19 at 21:22 +0300, Ville Syrjälä wrote:
> > On Mon, Jun 19, 2017 at 10:23:41AM -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 only apply to SKL and BXT.
> > >
> > > v2: Instead of increase the if/else move the wa
> > > to individual platform functions. (Ville).
> > > Also remove from GLK since spec only mentions SKL and BXT.
> >
> > The spec seems to be telling me that these shouldn't needed on any
> > platform. But there are scary comments in the code saying that they
> > have been kept to cure some hangs. Probably best to wair for Mika to be
> > back to review this one.
>
> About WaDisableKillLogic:
The patch didn't seem to touch WaDisableKillLogic. Or maybe I read the
wrong patch.
>
> Bspec: Gen 9 Workarounds:
> #0684 3D WaDisableKillLogic - SKL and BXT.
>
> About the other one:
>
> GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC...
> Fun, but it is not in the spec anymore indeed. If you search for e184
> gen9 workarounds page is listed, but it is not mentioned anymore.
> Mika and I indeed saw that there at some point for SKL at least, but not
> for others..
>
> not sure!
>
> >
> > >
> > > Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > > Cc: Mika Kuoppala <mika.kuoppala@intel.com>
> > > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > > ---
> > > drivers/gpu/drm/i915/intel_engine_cs.c | 26 ++++++++++++++++----------
> > > 1 file changed, 16 insertions(+), 10 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
> > > index a4487c5..33c3a9d 100644
> > > --- a/drivers/gpu/drm/i915/intel_engine_cs.c
> > > +++ b/drivers/gpu/drm/i915/intel_engine_cs.c
> > > @@ -831,11 +831,6 @@ 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))
> > > - WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
> > > - GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC);
> > > -
> > > /* WaDisableDgMirrorFixInHalfSliceChicken5:bxt */
> > > if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1))
> > > WA_CLR_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN5,
> > > @@ -894,11 +889,6 @@ 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))
> > > - I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
> > > - BDW_DISABLE_HDC_INVALIDATION);
> > > -
> > > /* WaDisableSamplerPowerBypassForSOPingPong:skl,bxt,kbl,cfl */
> > > if (IS_SKYLAKE(dev_priv) ||
> > > IS_KABYLAKE(dev_priv) ||
> > > @@ -1007,6 +997,14 @@ static int skl_init_workarounds(struct intel_engine_cs *engine)
> > > if (ret)
> > > return ret;
> > >
> > > + /* Syncing dependencies between camera and graphics:skl */
> > > + WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
> > > + GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC);
> > > +
> > > + /* WaDisableHDCInvalidation:skl */
> > > + I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
> > > + BDW_DISABLE_HDC_INVALIDATION);
> > > +
> > > return skl_tune_iz_hashing(engine);
> > > }
> > >
> > > @@ -1076,6 +1074,14 @@ static int bxt_init_workarounds(struct intel_engine_cs *engine)
> > > WA_SET_BIT(GEN9_GAMT_ECO_REG_RW_IA,
> > > GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);
> > >
> > > + /* Syncing dependencies between camera and graphics:bxt */
> > > + WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
> > > + GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC);
> > > +
> > > + /* WaDisableHDCInvalidation:bxt */
> > > + I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
> > > + BDW_DISABLE_HDC_INVALIDATION);
> > > +
> > > return 0;
> > > }
> > >
> > > --
> > > 1.9.1
> >
>
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-06-19 19:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-19 17:23 [PATCH] drm/i915: Remove WaDisableKillLogic and GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC for KBL and GLK Rodrigo Vivi
2017-06-19 17:46 ` ✓ Fi.CI.BAT: success for " Patchwork
2017-06-19 18:22 ` [PATCH] " Ville Syrjälä
2017-06-19 19:01 ` Vivi, Rodrigo
2017-06-19 19:17 ` Ville Syrjälä
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.