* [Intel-gfx] [PATCH] drm/i915: Remove lite restore defines @ 2020-02-03 16:33 Mika Kuoppala 2020-02-03 16:37 ` Chris Wilson ` (2 more replies) 0 siblings, 3 replies; 4+ messages in thread From: Mika Kuoppala @ 2020-02-03 16:33 UTC (permalink / raw) To: intel-gfx We have switched from tail manipulation to forced context restore to implement WaIdleLiteRestore. Remove the useless defines and comments. References: f26a9e959a7b ("drm/i915/gt: Detect if we miss WaIdleLiteRestore") Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> --- drivers/gpu/drm/i915/gt/intel_lrc.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c index c196fb90c59f..bc0835c3fb2c 100644 --- a/drivers/gpu/drm/i915/gt/intel_lrc.c +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c @@ -176,8 +176,6 @@ /* Typical size of the average request (2 pipecontrols and a MI_BB) */ #define EXECLISTS_REQUEST_SIZE 64 /* bytes */ -#define WA_TAIL_DWORDS 2 -#define WA_TAIL_BYTES (sizeof(u32) * WA_TAIL_DWORDS) struct virtual_engine { struct intel_engine_cs base; @@ -2927,22 +2925,6 @@ static void execlists_context_reset(struct intel_context *ce) CE_TRACE(ce, "reset\n"); GEM_BUG_ON(!intel_context_is_pinned(ce)); - /* - * Because we emit WA_TAIL_DWORDS there may be a disparity - * between our bookkeeping in ce->ring->head and ce->ring->tail and - * that stored in context. As we only write new commands from - * ce->ring->tail onwards, everything before that is junk. If the GPU - * starts reading from its RING_HEAD from the context, it may try to - * execute that junk and die. - * - * The contexts that are stilled pinned on resume belong to the - * kernel, and are local to each engine. All other contexts will - * have their head/tail sanitized upon pinning before use, so they - * will never see garbage, - * - * So to avoid that we reset the context images upon resume. For - * simplicity, we just zero everything out. - */ intel_ring_reset(ce->ring, ce->ring->emit); /* Scrub away the garbage */ -- 2.17.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: Remove lite restore defines 2020-02-03 16:33 [Intel-gfx] [PATCH] drm/i915: Remove lite restore defines Mika Kuoppala @ 2020-02-03 16:37 ` Chris Wilson 2020-02-04 19:20 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork 2020-02-04 19:40 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2 siblings, 0 replies; 4+ messages in thread From: Chris Wilson @ 2020-02-03 16:37 UTC (permalink / raw) To: Mika Kuoppala, intel-gfx Quoting Mika Kuoppala (2020-02-03 16:33:12) > We have switched from tail manipulation to forced context restore > to implement WaIdleLiteRestore. Remove the useless defines and comments. We still use the wa_tail as the first pass to avoid having to do WaIdleLiteRestore. And we do need to reset the ring after a suspend/resume because of the wa_tail. Hopefully, our selftest for the latter still detects such bugs... We just aren't using the macro any more. -Chris _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Remove lite restore defines 2020-02-03 16:33 [Intel-gfx] [PATCH] drm/i915: Remove lite restore defines Mika Kuoppala 2020-02-03 16:37 ` Chris Wilson @ 2020-02-04 19:20 ` Patchwork 2020-02-04 19:40 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2 siblings, 0 replies; 4+ messages in thread From: Patchwork @ 2020-02-04 19:20 UTC (permalink / raw) To: Mika Kuoppala; +Cc: intel-gfx == Series Details == Series: drm/i915: Remove lite restore defines URL : https://patchwork.freedesktop.org/series/72933/ State : warning == Summary == $ dim checkpatch origin/drm-tip cc204e4078d6 drm/i915: Remove lite restore defines -:9: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #9: References: f26a9e959a7b ("drm/i915/gt: Detect if we miss WaIdleLiteRestore") -:9: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit f26a9e959a7b ("drm/i915/gt: Detect if we miss WaIdleLiteRestore")' #9: References: f26a9e959a7b ("drm/i915/gt: Detect if we miss WaIdleLiteRestore") total: 1 errors, 1 warnings, 0 checks, 30 lines checked _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Remove lite restore defines 2020-02-03 16:33 [Intel-gfx] [PATCH] drm/i915: Remove lite restore defines Mika Kuoppala 2020-02-03 16:37 ` Chris Wilson 2020-02-04 19:20 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork @ 2020-02-04 19:40 ` Patchwork 2 siblings, 0 replies; 4+ messages in thread From: Patchwork @ 2020-02-04 19:40 UTC (permalink / raw) To: Mika Kuoppala; +Cc: intel-gfx == Series Details == Series: drm/i915: Remove lite restore defines URL : https://patchwork.freedesktop.org/series/72933/ State : success == Summary == CI Bug Log - changes from CI_DRM_7864 -> Patchwork_16400 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16400/index.html Known issues ------------ Here are the changes found in Patchwork_16400 that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_close_race@basic-threads: - fi-byt-j1900: [PASS][1] -> [INCOMPLETE][2] ([i915#45]) [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7864/fi-byt-j1900/igt@gem_close_race@basic-threads.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16400/fi-byt-j1900/igt@gem_close_race@basic-threads.html * igt@gem_exec_parallel@fds: - fi-byt-n2820: [PASS][3] -> [FAIL][4] ([i915#694]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7864/fi-byt-n2820/igt@gem_exec_parallel@fds.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16400/fi-byt-n2820/igt@gem_exec_parallel@fds.html * igt@gem_exec_suspend@basic-s0: - fi-cml-s: [PASS][5] -> [FAIL][6] ([fdo#103375]) [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7864/fi-cml-s/igt@gem_exec_suspend@basic-s0.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16400/fi-cml-s/igt@gem_exec_suspend@basic-s0.html * igt@i915_pm_rpm@basic-rte: - fi-hsw-4770: [PASS][7] -> [SKIP][8] ([fdo#109271]) +1 similar issue [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7864/fi-hsw-4770/igt@i915_pm_rpm@basic-rte.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16400/fi-hsw-4770/igt@i915_pm_rpm@basic-rte.html * igt@i915_selftest@live_gem_contexts: - fi-kbl-x1275: [PASS][9] -> [DMESG-FAIL][10] ([i915#943]) [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7864/fi-kbl-x1275/igt@i915_selftest@live_gem_contexts.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16400/fi-kbl-x1275/igt@i915_selftest@live_gem_contexts.html * igt@kms_chamelium@hdmi-hpd-fast: - fi-kbl-7500u: [PASS][11] -> [FAIL][12] ([fdo#111407]) [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7864/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16400/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html * igt@kms_frontbuffer_tracking@basic: - fi-hsw-peppy: [PASS][13] -> [DMESG-WARN][14] ([i915#44]) [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7864/fi-hsw-peppy/igt@kms_frontbuffer_tracking@basic.html [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16400/fi-hsw-peppy/igt@kms_frontbuffer_tracking@basic.html #### Possible fixes #### * igt@gem_exec_suspend@basic-s3: - fi-cml-s: [INCOMPLETE][15] ([i915#1078] / [i915#283]) -> [PASS][16] [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7864/fi-cml-s/igt@gem_exec_suspend@basic-s3.html [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16400/fi-cml-s/igt@gem_exec_suspend@basic-s3.html * igt@i915_selftest@live_blt: - fi-hsw-4770: [DMESG-FAIL][17] ([i915#725]) -> [PASS][18] [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7864/fi-hsw-4770/igt@i915_selftest@live_blt.html [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16400/fi-hsw-4770/igt@i915_selftest@live_blt.html * igt@i915_selftest@live_execlists: - fi-icl-y: [DMESG-FAIL][19] ([fdo#108569]) -> [PASS][20] [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7864/fi-icl-y/igt@i915_selftest@live_execlists.html [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16400/fi-icl-y/igt@i915_selftest@live_execlists.html * igt@i915_selftest@live_gtt: - fi-skl-6600u: [TIMEOUT][21] ([fdo#111732] / [fdo#112271]) -> [PASS][22] [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7864/fi-skl-6600u/igt@i915_selftest@live_gtt.html [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16400/fi-skl-6600u/igt@i915_selftest@live_gtt.html * igt@i915_selftest@live_perf: - fi-apl-guc: [INCOMPLETE][23] ([fdo#103927]) -> [PASS][24] [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7864/fi-apl-guc/igt@i915_selftest@live_perf.html [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16400/fi-apl-guc/igt@i915_selftest@live_perf.html #### Warnings #### * igt@gem_exec_parallel@contexts: - fi-byt-n2820: [TIMEOUT][25] ([fdo#112271]) -> [FAIL][26] ([i915#694]) [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7864/fi-byt-n2820/igt@gem_exec_parallel@contexts.html [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16400/fi-byt-n2820/igt@gem_exec_parallel@contexts.html [fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375 [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927 [fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569 [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 [fdo#111407]: https://bugs.freedesktop.org/show_bug.cgi?id=111407 [fdo#111732]: https://bugs.freedesktop.org/show_bug.cgi?id=111732 [fdo#112271]: https://bugs.freedesktop.org/show_bug.cgi?id=112271 [i915#1078]: https://gitlab.freedesktop.org/drm/intel/issues/1078 [i915#283]: https://gitlab.freedesktop.org/drm/intel/issues/283 [i915#44]: https://gitlab.freedesktop.org/drm/intel/issues/44 [i915#45]: https://gitlab.freedesktop.org/drm/intel/issues/45 [i915#694]: https://gitlab.freedesktop.org/drm/intel/issues/694 [i915#725]: https://gitlab.freedesktop.org/drm/intel/issues/725 [i915#943]: https://gitlab.freedesktop.org/drm/intel/issues/943 Participating hosts (50 -> 46) ------------------------------ Additional (3): fi-skl-lmem fi-glk-dsi fi-snb-2520m Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-ctg-p8600 fi-tgl-y fi-byt-clapper fi-bdw-samus Build changes ------------- * CI: CI-20190529 -> None * Linux: CI_DRM_7864 -> Patchwork_16400 CI-20190529: 20190529 CI_DRM_7864: 5a140e2fc771e4c8b10d14e2db7bfb4996ee9d8a @ git://anongit.freedesktop.org/gfx-ci/linux IGT_5417: 33cc93c8ba5daa0b7498f297a4f626844d895d06 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_16400: cc204e4078d68042a05acc3439349ab1bf0803c1 @ git://anongit.freedesktop.org/gfx-ci/linux == Linux commits == cc204e4078d6 drm/i915: Remove lite restore defines == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16400/index.html _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-02-04 19:40 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-02-03 16:33 [Intel-gfx] [PATCH] drm/i915: Remove lite restore defines Mika Kuoppala 2020-02-03 16:37 ` Chris Wilson 2020-02-04 19:20 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork 2020-02-04 19:40 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
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.