Skip to contentSkip to conversation

drm/i915/cfl: Fix Workarounds.

PATCH In review Rodrigo Vivi 4 participants 4 messages Jun 19, 2017 – Jun 29, 2017

Subsystems (2)
lore
Share & tools
lore

Rodrigo Vivi

author maintainer
#0 lore raw

PATCH 1/1 drm/i915/cfl: Fix Workarounds.

During the review of Coffee Lake workarounds Mika pointed out that WaDisableKillLogic and GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC should be removed from CFL and with that I should carry the rv-b.

However when doing the v2 I removed another Workaround that should remain because although not mentioned by spec the history of hangs around it advocates on its favor.

On some follow-up patches I continued operating on the wrong workardound, but Ville noticed that, so here is the fix for the current CFL code that is upstream already.

Fixes 46c26662d2f ("drm/i915/cfl: Introduce Coffee Lake workarounds.")
Cc Ville Syrjälä <[email protected]>
Cc Dhinakaran Pandiyan <[email protected]>
Cc Mika Kuoppala <[email protected]>
---
 drivers/gpu/drm/i915/intel_engine_cs.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/intel_engine_cs.c +7 -7
index a4487c5..5b4de71 100644
@@ -821,9 +821,10 @@ static int gen9_init_workarounds(struct intel_engine_cs *engine)
 	I915_WRITE(BDW_SCRATCH1, I915_READ(BDW_SCRATCH1) |
 		   GEN9_LBS_SLA_RETRY_TIMER_DECREMENT_ENABLE);
 
-	/* WaDisableKillLogic:bxt,skl,kbl,cfl */
-	I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
-		   ECOCHK_DIS_TLB);
+	/* WaDisableKillLogic:bxt,skl,kbl */
+	if (!IS_COFFEELAKE(dev_priv))
+		I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
+			   ECOCHK_DIS_TLB);
 
 	/* WaClearFlowControlGpgpuContextSave:skl,bxt,kbl,glk,cfl */
 	/* WaDisablePartialInstShootdown:skl,bxt,kbl,glk,cfl */
@@ -894,10 +895,9 @@ 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);
+	/* WaDisableHDCInvalidation:skl,bxt,kbl,cfl */
+	I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
+		   BDW_DISABLE_HDC_INVALIDATION);
 
 	/* WaDisableSamplerPowerBypassForSOPingPong:skl,bxt,kbl,cfl */
 	if (IS_SKYLAKE(dev_priv) ||
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✓ Fi.CI.BAT: success for drm/i915/cfl: Fix Workarounds.

== Series Details ==

== Series Details ==

Series: drm/i915/cfl: Fix Workarounds.
URL : https://patchwork.freedesktop.org/series/26010/
State : success

== Summary ==

Series 26010v1 drm/i915/cfl: Fix Workarounds.
https://patchwork.freedesktop.org/api/1.0/series/26010/revisions/1/mbox/

Test gem_exec_flush:

        Subgroup basic-batch-kernel-default-uc:
                fail       -> PASS       (fi-snb-2600) fdo#100007
Test gem_exec_suspend:
        Subgroup basic-s4-devices:
                pass       -> DMESG-WARN (fi-kbl-r) fdo#100125

fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fdo#100125 https://bugs.freedesktop.org/show_bug.cgi?id=100125

fi-bdw-5557u     total:278  pass:267  dwarn:0   dfail:0   fail:0   skip:11  time:459s
fi-bdw-gvtdvm    total:278  pass:256  dwarn:8   dfail:0   fail:0   skip:14  time:490s
fi-bsw-n3050     total:278  pass:242  dwarn:0   dfail:0   fail:0   skip:36  time:576s
fi-bxt-j4205     total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19  time:547s
fi-byt-j1900     total:278  pass:254  dwarn:0   dfail:0   fail:0   skip:24  time:489s
fi-byt-n2820     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time:491s
fi-glk-2a        total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19  time:583s
fi-hsw-4770      total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time:429s
fi-hsw-4770r     total:278  pass:261  dwarn:0   dfail:0   fail:0   skip:16  time:419s
fi-ilk-650       total:278  pass:227  dwarn:0   dfail:0   fail:0   skip:50  time:463s
fi-ivb-3520m     total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:18  time:505s
fi-ivb-3770      total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:18  time:514s
fi-kbl-7500u     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:472s
fi-kbl-7560u     total:278  pass:267  dwarn:1   dfail:0   fail:0   skip:10  time:576s
fi-kbl-r         total:278  pass:259  dwarn:1   dfail:0   fail:0   skip:18  time:572s
fi-skl-6260u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:475s
fi-skl-6700hq    total:278  pass:228  dwarn:1   dfail:0   fail:27  skip:22  time:432s
fi-skl-6700k     total:278  pass:256  dwarn:4   dfail:0   fail:0   skip:18  time:515s
fi-skl-6770hq    total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:499s
fi-skl-gvtdvm    total:278  pass:265  dwarn:0   dfail:0   fail:0   skip:13  time:503s
fi-snb-2520m     total:278  pass:249  dwarn:0   dfail:0   fail:0   skip:28  time:619s
fi-snb-2600      total:278  pass:248  dwarn:0   dfail:0   fail:0   skip:29  time:404s

28880958b7cd59f14172c942d82182acf104d880 drm-tip: 2017y-06m-19d-21h-07m-06s UTC integration manifest f241681 drm/i915/cfl: Fix Workarounds.

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4990/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v1 1/1
#2 lore raw
In reply to Rodrigo Vivi

I went and read Mika's review in [1] and also the patches posted and committed after that. The version currently in drm-tip deviates from his review and the fix here addresses Mika's comments correctly.

Verified that BSpec does indeed say WaDisableKillLogic is applicable to only SKL and BXT.

As for WaDisableHDCInvalidation, git blame indicates this is intended to be retained for all gen9 platforms.

So this patch lgtm.

[1]
https://lists.freedesktop.org/archives/intel-gfx/2017-June/130100.html

-DK

Quoted 43 lines · Rodrigo Vivi

During the review of Coffee Lake workarounds Mika pointed out that WaDisableKillLogic and GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC should be removed from CFL and with that I should carry the rv-b.

However when doing the v2 I removed another Workaround that should remain because although not mentioned by spec the history of hangs around it advocates on its favor.

On some follow-up patches I continued operating on the wrong workardound, but Ville noticed that, so here is the fix for the current CFL code that is upstream already.

Fixes 46c26662d2f ("drm/i915/cfl: Introduce Coffee Lake workarounds.")
Cc Ville Syrjälä <[email protected]>
Cc Dhinakaran Pandiyan <[email protected]>
Cc Mika Kuoppala <[email protected]>
---
 drivers/gpu/drm/i915/intel_engine_cs.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/intel_engine_cs.c +4 -3
index a4487c5..5b4de71 100644
@@ -821,9 +821,10 @@ static int gen9_init_workarounds(struct intel_engine_cs *engine)
 	I915_WRITE(BDW_SCRATCH1, I915_READ(BDW_SCRATCH1) |
 		   GEN9_LBS_SLA_RETRY_TIMER_DECREMENT_ENABLE);
 
-	/* WaDisableKillLogic:bxt,skl,kbl,cfl */
-	I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
-		   ECOCHK_DIS_TLB);
+	/* WaDisableKillLogic:bxt,skl,kbl */
+	if (!IS_COFFEELAKE(dev_priv))
+		I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
+			   ECOCHK_DIS_TLB);
 
 	/* WaClearFlowControlGpgpuContextSave:skl,bxt,kbl,glk,cfl */
 	/* WaDisablePartialInstShootdown:skl,bxt,kbl,glk,cfl */
@@ -894,10 +895,9 @@ static int gen9_init_workarounds(struct intel_engine_cs *engine)
 	WA_SET_BIT_MASKED(HDC_CHICKEN0,
 			  HDC_FORCE_NON_COHERENT);
 

drivers/gpu/drm/i915/intel_engine_cs.c static int gen9_init_workarounds(struct intel_engine_cs *engine) · line 903

Quoted 10 lines
drivers/gpu/drm/i915/intel_engine_cs.c +3 -4
-	/* WaDisableHDCInvalidation:skl,bxt,kbl */
-	if (!IS_COFFEELAKE(dev_priv))
-		I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
-			   BDW_DISABLE_HDC_INVALIDATION);
+	/* WaDisableHDCInvalidation:skl,bxt,kbl,cfl */
+	I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
+		   BDW_DISABLE_HDC_INVALIDATION);
 
 	/* WaDisableSamplerPowerBypassForSOPingPong:skl,bxt,kbl,cfl */
 	if (IS_SKYLAKE(dev_priv) ||

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

patch merged to dinq.
thanks a lot for the review and sorry for causing trouble with the version of that previous patch.

Quoted 80 lines · Dhinakaran

I went and read Mika's review in [1] and also the patches posted and committed after that. The version currently in drm-tip deviates from his review and the fix here addresses Mika's comments correctly.

Verified that BSpec does indeed say WaDisableKillLogic is applicable to only SKL and BXT.

As for WaDisableHDCInvalidation, git blame indicates this is intended to be retained for all gen9 platforms.

So this patch lgtm.

[1]
https://lists.freedesktop.org/archives/intel-gfx/2017-June/130100.html

-DK

Quoted 43 lines · Rodrigo Vivi

During the review of Coffee Lake workarounds Mika pointed out that WaDisableKillLogic and GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC should be removed from CFL and with that I should carry the rv-b.

However when doing the v2 I removed another Workaround that should remain because although not mentioned by spec the history of hangs around it advocates on its favor.

On some follow-up patches I continued operating on the wrong workardound, but Ville noticed that, so here is the fix for the current CFL code that is upstream already.

Fixes 46c26662d2f ("drm/i915/cfl: Introduce Coffee Lake workarounds.")
Cc Ville Syrjälä <[email protected]>
Cc Dhinakaran Pandiyan <[email protected]>
Cc Mika Kuoppala <[email protected]>
---
 drivers/gpu/drm/i915/intel_engine_cs.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/intel_engine_cs.c +4 -3
index a4487c5..5b4de71 100644
@@ -821,9 +821,10 @@ static int gen9_init_workarounds(struct intel_engine_cs *engine)
      I915_WRITE(BDW_SCRATCH1, I915_READ(BDW_SCRATCH1) |
                 GEN9_LBS_SLA_RETRY_TIMER_DECREMENT_ENABLE);
 
-     /* WaDisableKillLogic:bxt,skl,kbl,cfl */
-     I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
-                ECOCHK_DIS_TLB);
+     /* WaDisableKillLogic:bxt,skl,kbl */
+     if (!IS_COFFEELAKE(dev_priv))
+             I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
+                        ECOCHK_DIS_TLB);
 
      /* WaClearFlowControlGpgpuContextSave:skl,bxt,kbl,glk,cfl */
      /* WaDisablePartialInstShootdown:skl,bxt,kbl,glk,cfl */
@@ -894,10 +895,9 @@ static int gen9_init_workarounds(struct intel_engine_cs *engine)
      WA_SET_BIT_MASKED(HDC_CHICKEN0,
                        HDC_FORCE_NON_COHERENT);
 

drivers/gpu/drm/i915/intel_engine_cs.c static int gen9_init_workarounds(struct intel_engine_cs *engine) · line 903

Quoted 10 lines
drivers/gpu/drm/i915/intel_engine_cs.c +3 -4
-     /* WaDisableHDCInvalidation:skl,bxt,kbl */
-     if (!IS_COFFEELAKE(dev_priv))
-             I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
-                        BDW_DISABLE_HDC_INVALIDATION);
+     /* WaDisableHDCInvalidation:skl,bxt,kbl,cfl */
+     I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) |
+                BDW_DISABLE_HDC_INVALIDATION);
 
      /* WaDisableSamplerPowerBypassForSOPingPong:skl,bxt,kbl,cfl */
      if (IS_SKYLAKE(dev_priv) ||

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 6 lines
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx