drm/i915/bxt Enable existing workarounds for Broxton
Subsystems (2)
cover drm/i915/bxt Enable existing workarounds for Broxton
The following patch series either enables a workaround for Broxton, marks it as applicable to Broxton, or moves it in to the SoC specific initialisation.
v2: Split out the changes as one patch per workaround (Requested by Imre)
Removed unused additional register.
Cleaned up whitespace. (Imre)
Cleaned up revision ID usage (Imre)
Nick Hoath (9):
drm/i915/bxt: Mark WaDisablePartialInstShootdown as for Broxton also. drm/i915/bxt: Mark workaround as for Skylake & Broxton drm/i915/bxt: Enable WaDisableDgMirrorFixInHalfSliceChicken5 for
Broxton
drm/i915/bxt: Enable
WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken for Broxton
drm/i915/bxt: Enable WaEnableYV12BugFixInHalfSliceChicken7 for Broxton drm/i915/bxt: Move WaForceEnableNonCoherent to Skylake only drm/i915/bxt: Mark Wa4x4STCOptimizationDisable as for Broxton also. drm/i915/bxt: Mark WaDisablePartialResolveInVc as for Broxton also. drm/i915/bxt: Mark WaCcsTlbPrefetchDisable as for Broxton also.
drivers/gpu/drm/i915/intel_ringbuffer.c | 49 +++++++++++++++++---------------- 1 file changed, 26 insertions(+), 23 deletions(-)
Signature · 6 lines
2.1.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/9 drm/i915/bxt: Mark WaDisablePartialInstShootdown as for Broxton also.
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +1 -1
@@ -919,7 +919,7 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)struct drm_device *dev = ring->dev;struct drm_i915_private *dev_priv = dev->dev_private; -/* WaDisablePartialInstShootdown:skl */ +/* WaDisablePartialInstShootdown:skl,bxt */ WA_SET_BIT_MASKED (GEN8_ROW_CHICKEN ,PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE );
Signature · 6 lines
2.1.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/9 drm/i915/bxt: Mark workaround as for Skylake & Broxton
In reply to Nick Hoath--- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +1 -1
@@ -923,7 +923,7 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)WA_SET_BIT_MASKED (GEN8_ROW_CHICKEN ,PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE ); -/* Syncing dependencies between camera and graphics */ +/* Syncing dependencies between camera and graphics:skl,bxt */ WA_SET_BIT_MASKED (HALF_SLICE_CHICKEN3 ,GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC );
Signature · 6 lines
2.1.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/9 drm/i915/bxt: Enable WaDisableDgMirrorFixInHalfSliceChicken5 for Broxton
In reply to Nick Hoath--- drivers/gpu/drm/i915/intel_ringbuffer.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +4 -3
@@ -927,9 +927,10 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)WA_SET_BIT_MASKED (HALF_SLICE_CHICKEN3 ,GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC ); -if (INTEL_REVID (dev) ==SKL_REVID_A0 || -INTEL_REVID (dev) ==SKL_REVID_B0 ) { -/* WaDisableDgMirrorFixInHalfSliceChicken5:skl */ +if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) ==SKL_REVID_A0 || +INTEL_REVID (dev) ==SKL_REVID_B0 )) || + (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 )) { +/* WaDisableDgMirrorFixInHalfSliceChicken5:skl,bxt */ WA_CLR_BIT_MASKED (GEN9_HALF_SLICE_CHICKEN5 ,GEN9_DG_MIRROR_FIX_ENABLE ); }
Signature · 6 lines
2.1.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/9 drm/i915/bxt: Enable WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken for Broxton
In reply to Nick Hoath--- drivers/gpu/drm/i915/intel_ringbuffer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +3 -2
@@ -935,8 +935,9 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring) GEN9_DG_MIRROR_FIX_ENABLE); } -if (IS_SKYLAKE (dev) &&INTEL_REVID (dev) <=SKL_REVID_B0 ) { -/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl */ +if ((IS_SKYLAKE (dev) &&INTEL_REVID (dev) <=SKL_REVID_B0 ) || + (IS_BROXTON (dev) &&INTEL_REVID (dev) <BXT_REVID_B0 )) { +/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */ WA_SET_BIT_MASKED (GEN7_COMMON_SLICE_CHICKEN1 ,GEN9_RHWO_OPTIMIZATION_DISABLE ); WA_SET_BIT_MASKED(GEN9_SLICE_COMMON_ECO_CHICKEN0,
Signature · 6 lines
2.1.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/9 drm/i915/bxt: Enable WaEnableYV12BugFixInHalfSliceChicken7 for Broxton
In reply to Nick Hoath--- drivers/gpu/drm/i915/intel_ringbuffer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +3 -2
@@ -944,8 +944,9 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring) DISABLE_PIXEL_MASK_CAMMING); } -if (INTEL_REVID (dev) >=SKL_REVID_C0 ) { -/* WaEnableYV12BugFixInHalfSliceChicken7:skl */ +if ((IS_SKYLAKE (dev) &&INTEL_REVID (dev) >=SKL_REVID_C0 ) || +IS_BROXTON (dev)) { +/* WaEnableYV12BugFixInHalfSliceChicken7:skl,bxt */ WA_SET_BIT_MASKED (GEN9_HALF_SLICE_CHICKEN7 ,GEN9_ENABLE_YV12_BUGFIX ); }
Signature · 6 lines
2.1.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/9 drm/i915/bxt: Move WaForceEnableNonCoherent to Skylake only
In reply to Nick Hoath--- drivers/gpu/drm/i915/intel_ringbuffer.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +11 -11
@@ -951,17 +951,6 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring) GEN9_ENABLE_YV12_BUGFIX); } -if (INTEL_REVID (dev) <=SKL_REVID_D0 ) { -/* -*Use Force Non-Coherent whenever executing a 3D context. This -* is a workaround for a possible hang in the unlikely event -* a TLB invalidation occurs during a PSD flush. -*/ -/* WaForceEnableNonCoherent:skl */ -WA_SET_BIT_MASKED (HDC_CHICKEN0 , -HDC_FORCE_NON_COHERENT ); - } -/* Wa4x4STCOptimizationDisable:skl */ WA_SET_BIT_MASKED (CACHE_MODE_1 , GEN8_4x4_STC_OPTIMIZATION_DISABLE);
@@ -1039,6 +1028,17 @@ static int skl_init_workarounds(struct intel_engine_cs *ring)WA_SET_BIT_MASKED (HIZ_CHICKEN ,BDW_HIZ_POWER_COMPILER_CLOCK_GATING_DISABLE ); +if (INTEL_REVID (dev) <=SKL_REVID_D0 ) { +/* +*Use Force Non-Coherent whenever executing a 3D context. This +* is a workaround for a possible hang in the unlikely event +* a TLB invalidation occurs during a PSD flush. +*/ +/* WaForceEnableNonCoherent:skl */ +WA_SET_BIT_MASKED (HDC_CHICKEN0 , +HDC_FORCE_NON_COHERENT ); + } +return skl_tune_iz_hashing (ring); }
Signature · 6 lines
2.1.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/9 drm/i915/bxt: Mark Wa4x4STCOptimizationDisable as for Broxton also.
In reply to Nick Hoath--- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +1 -1
@@ -951,7 +951,7 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring) GEN9_ENABLE_YV12_BUGFIX); } -/* Wa4x4STCOptimizationDisable:skl */ +/* Wa4x4STCOptimizationDisable:skl,bxt */ WA_SET_BIT_MASKED (CACHE_MODE_1 , GEN8_4x4_STC_OPTIMIZATION_DISABLE);/* WaDisablePartialResolveInVc:skl */
Signature · 6 lines
2.1.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/9 drm/i915/bxt: Mark WaDisablePartialResolveInVc as for Broxton also.
In reply to Nick Hoath--- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +1 -1
@@ -954,7 +954,7 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)/* Wa4x4STCOptimizationDisable:skl,bxt */ WA_SET_BIT_MASKED (CACHE_MODE_1 , GEN8_4x4_STC_OPTIMIZATION_DISABLE); -/* WaDisablePartialResolveInVc:skl */ +/* WaDisablePartialResolveInVc:skl,bxt */ WA_SET_BIT_MASKED (CACHE_MODE_1 ,GEN9_PARTIAL_RESOLVE_IN_VC_DISABLE );/* WaCcsTlbPrefetchDisable:skl */
Signature · 6 lines
2.1.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 9/9 drm/i915/bxt: Mark WaCcsTlbPrefetchDisable as for Broxton also.
In reply to Nick Hoath--- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +1 -1
@@ -957,7 +957,7 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)/* WaDisablePartialResolveInVc:skl,bxt */ WA_SET_BIT_MASKED (CACHE_MODE_1 ,GEN9_PARTIAL_RESOLVE_IN_VC_DISABLE ); -/* WaCcsTlbPrefetchDisable:skl */ +/* WaCcsTlbPrefetchDisable:skl,bxt */ WA_CLR_BIT_MASKED (GEN9_HALF_SLICE_CHICKEN5 ,GEN9_CCS_TLB_PREFETCH_ENABLE );
Signature · 6 lines
2.1.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 9/9] drm/i915/bxt: Mark WaCcsTlbPrefetchDisable as for Broxton also.
Task id: 6345 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 276/276 276/276 ILK 302/302 302/302 SNB 316/316 316/316 IVB 342/342 342/342 BYT 286/286 286/286 BDW 321/321 321/321
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 21 lines · Nick Hoath
The following patch series either enables a workaround for Broxton, marks it as applicable to Broxton, or moves it in to the SoC specific initialisation.
v2: Split out the changes as one patch per workaround (Requested by Imre)
Removed unused additional register.
Cleaned up whitespace. (Imre)
Cleaned up revision ID usage (Imre)Nick Hoath (9):
drm/i915/bxt: Mark WaDisablePartialInstShootdown as for Broxton also. drm/i915/bxt: Mark workaround as for Skylake & Broxton drm/i915/bxt: Enable WaDisableDgMirrorFixInHalfSliceChicken5 for
Broxton
drm/i915/bxt: Enable
WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken for Broxton
drm/i915/bxt: Enable WaEnableYV12BugFixInHalfSliceChicken7 for Broxton drm/i915/bxt: Move WaForceEnableNonCoherent to Skylake only drm/i915/bxt: Mark Wa4x4STCOptimizationDisable as for Broxton also. drm/i915/bxt: Mark WaDisablePartialResolveInVc as for Broxton also. drm/i915/bxt: Mark WaCcsTlbPrefetchDisable as for Broxton also.
Quoted 2 lines
drivers/gpu/drm/i915/intel_ringbuffer.c | 49 +++++++++++++++++---------------- 1 file changed, 26 insertions(+), 23 deletions(-)
Looks ok, on the patchset:
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 22 lines · Imre Deak
Quoted 21 lines · Nick Hoath
The following patch series either enables a workaround for Broxton, marks it as applicable to Broxton, or moves it in to the SoC specific initialisation.
v2: Split out the changes as one patch per workaround (Requested by Imre)
Removed unused additional register.
Cleaned up whitespace. (Imre)
Cleaned up revision ID usage (Imre)Nick Hoath (9):
drm/i915/bxt: Mark WaDisablePartialInstShootdown as for Broxton also. drm/i915/bxt: Mark workaround as for Skylake & Broxton drm/i915/bxt: Enable WaDisableDgMirrorFixInHalfSliceChicken5 for
Broxton
drm/i915/bxt: Enable
WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken for Broxton
drm/i915/bxt: Enable WaEnableYV12BugFixInHalfSliceChicken7 for Broxton drm/i915/bxt: Move WaForceEnableNonCoherent to Skylake only drm/i915/bxt: Mark Wa4x4STCOptimizationDisable as for Broxton also. drm/i915/bxt: Mark WaDisablePartialResolveInVc as for Broxton also. drm/i915/bxt: Mark WaCcsTlbPrefetchDisable as for Broxton also.
Quoted 5 lines
Quoted 2 lines
drivers/gpu/drm/i915/intel_ringbuffer.c | 49 +++++++++++++++++---------------- 1 file changed, 26 insertions(+), 23 deletions(-)Looks ok, on the patchset:
Reviewed-by Imre Deak <[email protected]>
Entire series merged, thanks.
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx