Restore "08fff7aeddc9 ("drm/i915/tgl: Wa_1607138340")
diff mbox series

Message ID 20200603145529.3851-1-chris@chris-wilson.co.uk
State New
Headers show
Series
  • Restore "08fff7aeddc9 ("drm/i915/tgl: Wa_1607138340")
Related show

Commit Message

Chris Wilson June 3, 2020, 2:55 p.m. UTC
This restores 08fff7aeddc9 ("drm/i915/tgl: Wa_1607138340") by reverting
commit 921f0c47f228 ("drm/i915: Revert "drm/i915/tgl: Wa_1607138340"").

Our CI machines are recording a rare error where the CS events are out
of order, leading to a machine death. Restoring the Wa_1607138340 (i.e.
forcing a full restore on every context switch) prevents it. Whether or
not is it the same root cause remains to be seen, but since the machine
death is quite easy to hit on B0, it is unresolved.

Fixes: 921f0c47f228 ("drm/i915: Revert "drm/i915/tgl: Wa_1607138340"")
References: 08fff7aeddc9 ("drm/i915/tgl: Wa_1607138340")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Francesco Balestrieri <francesco.balestrieri@intel.com>
---
 drivers/gpu/drm/i915/gt/intel_lrc.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Chris Wilson June 3, 2020, 4:56 p.m. UTC | #1
Quoting Patchwork (2020-06-03 17:51:43)
> == Series Details ==
> 
> Series: Restore "08fff7aeddc9 ("drm/i915/tgl: Wa_1607138340") (rev2)
> URL   : https://patchwork.freedesktop.org/series/77959/
> State : failure
> 
> == Summary ==
> 
> CI Bug Log - changes from CI_DRM_8579 -> Patchwork_17855
> ====================================================
> 
> Summary
> -------
> 
>   **FAILURE**
> 
>   Serious unknown changes coming with Patchwork_17855 absolutely need to be
>   verified manually.
>   
>   If you think the reported changes have nothing to do with the changes
>   introduced in Patchwork_17855, please notify your bug team to allow them
>   to document this new failure mode, which will reduce false positives in CI.
> 
>   External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17855/index.html
> 
> Possible new issues
> -------------------
> 
>   Here are the unknown changes that may have been introduced in Patchwork_17855:
> 
> ### IGT changes ###
> 
> #### Possible regressions ####
> 
>   * igt@i915_selftest@live@hangcheck:
>     - fi-tgl-y:           [PASS][1] -> [INCOMPLETE][2]
>    [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8579/fi-tgl-y/igt@i915_selftest@live@hangcheck.html
>    [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17855/fi-tgl-y/igt@i915_selftest@live@hangcheck.html
> 
>   
> #### Suppressed ####
> 
>   The following results come from untrusted machines, tests, or statuses.
>   They do not affect the overall result.
> 
>   * igt@i915_selftest@live@hangcheck:
>     - {fi-tgl-u}:         [PASS][3] -> [INCOMPLETE][4]
>    [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8579/fi-tgl-u/igt@i915_selftest@live@hangcheck.html
>    [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17855/fi-tgl-u/igt@i915_selftest@live@hangcheck.html
>     - {fi-tgl-dsi}:       [PASS][5] -> [INCOMPLETE][6]
>    [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8579/fi-tgl-dsi/igt@i915_selftest@live@hangcheck.html
>    [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17855/fi-tgl-dsi/igt@i915_selftest@live@hangcheck.html

Well that would be a compelling reason not to.

Let's just wait for working HW.
-Chris

Patch
diff mbox series

diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
index aac8da18694f..e5e709dccef4 100644
--- a/drivers/gpu/drm/i915/gt/intel_lrc.c
+++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
@@ -1520,6 +1520,10 @@  static u64 execlists_update_context(struct i915_request *rq)
 	 */
 	wmb();
 
+	/* Wa_1607138340:tgl */
+	if (IS_TGL_REVID(rq->i915, TGL_REVID_A0, TGL_REVID_B0))
+		desc |= CTX_DESC_FORCE_RESTORE;
+
 	ce->lrc.desc &= ~CTX_DESC_FORCE_RESTORE;
 	return desc;
 }