* [PATCH] drm/i915/ringbuffer: 2-step restart
@ 2018-11-26 12:28 Chris Wilson
2018-11-26 13:12 ` ✓ Fi.CI.BAT: success for " Patchwork
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Chris Wilson @ 2018-11-26 12:28 UTC (permalink / raw)
To: intel-gfx
We may be simply restarting too fast for the culmudgeonly gen3/gen4 as
we still see missing interrupts following a reset. So let's try
restarting a little slower, first wake up the ring empty and then tell
it about the work it has to perform.
References: https://bugs.freedesktop.org/show_bug.cgi?id=108735
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/intel_ringbuffer.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 87eebc13c0d8..e18a64d41843 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -546,10 +546,11 @@ static int init_ring_common(struct intel_engine_cs *engine)
/* Check that the ring offsets point within the ring! */
GEM_BUG_ON(!intel_ring_offset_valid(ring, ring->head));
GEM_BUG_ON(!intel_ring_offset_valid(ring, ring->tail));
-
intel_ring_update_space(ring);
+
+ /* First wake the ring up to an empty/idle ring */
I915_WRITE_HEAD(engine, ring->head);
- I915_WRITE_TAIL(engine, ring->tail);
+ I915_WRITE_TAIL(engine, ring->head);
(void)I915_READ_TAIL(engine);
I915_WRITE_CTL(engine, RING_CTL_SIZE(ring->size) | RING_VALID);
@@ -574,6 +575,12 @@ static int init_ring_common(struct intel_engine_cs *engine)
if (INTEL_GEN(dev_priv) > 2)
I915_WRITE_MODE(engine, _MASKED_BIT_DISABLE(STOP_RING));
+ /* Now awake, let it get started */
+ if (ring->tail != ring->head) {
+ I915_WRITE_TAIL(engine, ring->tail);
+ (void)I915_READ_TAIL(engine);
+ }
+
/* Papering over lost _interrupts_ immediately following the restart */
intel_engine_wakeup(engine);
out:
--
2.20.0.rc1
_______________________________________________
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/ringbuffer: 2-step restart
2018-11-26 12:28 [PATCH] drm/i915/ringbuffer: 2-step restart Chris Wilson
@ 2018-11-26 13:12 ` Patchwork
2018-11-26 14:19 ` [PATCH] " Joonas Lahtinen
2018-11-26 17:24 ` ✓ Fi.CI.IGT: success for " Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2018-11-26 13:12 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/ringbuffer: 2-step restart
URL : https://patchwork.freedesktop.org/series/53009/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_5200 -> Patchwork_10905 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/53009/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_10905 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_exec_suspend@basic-s3:
fi-icl-u2: PASS -> DMESG-WARN (fdo#107724)
igt@kms_flip@basic-flip-vs-wf_vblank:
fi-byt-n2820: PASS -> FAIL (fdo#100368)
igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence:
fi-byt-clapper: PASS -> FAIL (fdo#107362, fdo#103191)
==== Possible fixes ====
igt@gem_ctx_create@basic-files:
{fi-icl-u3}: DMESG-WARN (fdo#107724) -> PASS
fi-bsw-n3050: FAIL (fdo#108656) -> PASS
fi-icl-u2: DMESG-WARN (fdo#107724) -> PASS
igt@gem_mmap_gtt@basic-small-copy:
fi-glk-dsi: INCOMPLETE (k.org#198133, fdo#103359) -> PASS
igt@kms_pipe_crc_basic@nonblocking-crc-pipe-b-frame-sequence:
fi-byt-clapper: FAIL (fdo#107362, fdo#103191) -> PASS
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
fdo#107724 https://bugs.freedesktop.org/show_bug.cgi?id=107724
fdo#108656 https://bugs.freedesktop.org/show_bug.cgi?id=108656
k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133
== Participating hosts (52 -> 46) ==
Missing (6): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600
== Build changes ==
* Linux: CI_DRM_5200 -> Patchwork_10905
CI_DRM_5200: d30879c3f1a18d3b7eeba861f63dc3522e6764ae @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4726: f48bebb15d3d2c1e6382e1f11b0aeac06fae6082 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10905: 7e6b056544d111a5c10a96a18074d14598453e57 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
7e6b056544d1 drm/i915/ringbuffer: 2-step restart
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10905/
_______________________________________________
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/ringbuffer: 2-step restart
2018-11-26 12:28 [PATCH] drm/i915/ringbuffer: 2-step restart Chris Wilson
2018-11-26 13:12 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2018-11-26 14:19 ` Joonas Lahtinen
2018-11-26 14:35 ` Chris Wilson
2018-11-26 17:24 ` ✓ Fi.CI.IGT: success for " Patchwork
2 siblings, 1 reply; 5+ messages in thread
From: Joonas Lahtinen @ 2018-11-26 14:19 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
Quoting Chris Wilson (2018-11-26 14:28:21)
> We may be simply restarting too fast for the culmudgeonly gen3/gen4 as
> we still see missing interrupts following a reset. So let's try
> restarting a little slower, first wake up the ring empty and then tell
> it about the work it has to perform.
>
> References: https://bugs.freedesktop.org/show_bug.cgi?id=108735
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Won't affect later Gens using ELSP, so:
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Regards, Joonas
_______________________________________________
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/ringbuffer: 2-step restart
2018-11-26 14:19 ` [PATCH] " Joonas Lahtinen
@ 2018-11-26 14:35 ` Chris Wilson
0 siblings, 0 replies; 5+ messages in thread
From: Chris Wilson @ 2018-11-26 14:35 UTC (permalink / raw)
To: Joonas Lahtinen, intel-gfx
Quoting Joonas Lahtinen (2018-11-26 14:19:30)
> Quoting Chris Wilson (2018-11-26 14:28:21)
> > We may be simply restarting too fast for the culmudgeonly gen3/gen4 as
> > we still see missing interrupts following a reset. So let's try
> > restarting a little slower, first wake up the ring empty and then tell
> > it about the work it has to perform.
> >
> > References: https://bugs.freedesktop.org/show_bug.cgi?id=108735
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>
> Won't affect later Gens using ELSP, so:
>
> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Now sit back and wait a week to see if had any impact on the bug at all.
-Chris
_______________________________________________
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
* ✓ Fi.CI.IGT: success for drm/i915/ringbuffer: 2-step restart
2018-11-26 12:28 [PATCH] drm/i915/ringbuffer: 2-step restart Chris Wilson
2018-11-26 13:12 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-11-26 14:19 ` [PATCH] " Joonas Lahtinen
@ 2018-11-26 17:24 ` Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2018-11-26 17:24 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/ringbuffer: 2-step restart
URL : https://patchwork.freedesktop.org/series/53009/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_5200_full -> Patchwork_10905_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_10905_full need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_10905_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_10905_full:
=== IGT changes ===
==== Warnings ====
igt@pm_rc6_residency@rc6-accuracy:
shard-snb: PASS -> SKIP
== Known issues ==
Here are the changes found in Patchwork_10905_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_exec_schedule@pi-ringfull-bsd:
shard-skl: NOTRUN -> FAIL (fdo#103158)
igt@kms_busy@extended-modeset-hang-newfb-render-c:
shard-skl: NOTRUN -> DMESG-WARN (fdo#107956) +1
{shard-iclb}: NOTRUN -> DMESG-WARN (fdo#107956)
igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-c:
shard-apl: NOTRUN -> DMESG-WARN (fdo#107956)
igt@kms_cursor_crc@cursor-256x85-sliding:
shard-skl: PASS -> FAIL (fdo#103232)
igt@kms_cursor_crc@cursor-64x64-dpms:
shard-glk: PASS -> FAIL (fdo#103232)
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-blt:
shard-apl: NOTRUN -> FAIL (fdo#103167)
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-pwrite:
shard-apl: PASS -> FAIL (fdo#103167)
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite:
{shard-iclb}: PASS -> FAIL (fdo#103167) +1
shard-glk: PASS -> FAIL (fdo#103167) +2
igt@kms_frontbuffer_tracking@fbc-rgb101010-draw-mmap-cpu:
shard-skl: PASS -> FAIL (fdo#103167, fdo#105682) +1
igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-shrfb-draw-render:
shard-skl: PASS -> FAIL (fdo#103167) +2
igt@kms_plane@plane-position-covered-pipe-c-planes:
shard-apl: PASS -> FAIL (fdo#103166)
shard-glk: PASS -> FAIL (fdo#103166)
igt@kms_plane_alpha_blend@pipe-a-alpha-7efc:
shard-apl: NOTRUN -> FAIL (fdo#108145)
igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
shard-skl: PASS -> FAIL (fdo#108145, fdo#107815)
igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
shard-skl: PASS -> FAIL (fdo#107815)
igt@kms_plane_alpha_blend@pipe-c-alpha-transparant-fb:
shard-skl: NOTRUN -> FAIL (fdo#108145)
igt@kms_setmode@basic:
shard-apl: PASS -> FAIL (fdo#99912)
igt@perf_pmu@rc6-runtime-pm-long:
shard-skl: NOTRUN -> FAIL (fdo#105010)
igt@pm_backlight@basic-brightness:
{shard-iclb}: PASS -> INCOMPLETE (fdo#107820)
igt@pm_rpm@debugfs-forcewake-user:
shard-skl: NOTRUN -> INCOMPLETE (fdo#107807)
igt@pm_rpm@modeset-non-lpsp:
shard-skl: SKIP -> INCOMPLETE (fdo#107807)
igt@pm_rpm@universal-planes:
{shard-iclb}: PASS -> DMESG-WARN (fdo#108654, fdo#108756)
{igt@runner@aborted}:
{shard-iclb}: NOTRUN -> FAIL (fdo#108756)
==== Possible fixes ====
igt@gem_ctx_isolation@rcs0-s3:
shard-skl: INCOMPLETE (fdo#104108, fdo#107773) -> PASS
igt@gem_userptr_blits@readonly-unsync:
shard-skl: INCOMPLETE (fdo#108074) -> PASS
igt@kms_cursor_crc@cursor-256x256-sliding:
shard-apl: INCOMPLETE (fdo#103927) -> PASS
igt@kms_cursor_crc@cursor-64x64-suspend:
shard-skl: INCOMPLETE (fdo#104108) -> PASS
igt@kms_flip@flip-vs-expired-vblank:
shard-skl: FAIL (fdo#105363) -> PASS +1
igt@kms_flip@plain-flip-fb-recreate:
shard-kbl: FAIL (fdo#100368) -> PASS
igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-mmap-wc:
{shard-iclb}: FAIL (fdo#103167) -> PASS +2
igt@pm_rpm@basic-rte:
shard-skl: INCOMPLETE (fdo#107807) -> PASS +1
igt@pm_rpm@system-suspend-devices:
{shard-iclb}: INCOMPLETE (fdo#107713, fdo#108840) -> PASS
==== Warnings ====
igt@i915_suspend@shrink:
shard-glk: DMESG-WARN (fdo#108784) -> INCOMPLETE (fdo#106886, k.org#198133, fdo#103359)
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103158 https://bugs.freedesktop.org/show_bug.cgi?id=103158
fdo#103166 https://bugs.freedesktop.org/show_bug.cgi?id=103166
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103232 https://bugs.freedesktop.org/show_bug.cgi?id=103232
fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#104108 https://bugs.freedesktop.org/show_bug.cgi?id=104108
fdo#105010 https://bugs.freedesktop.org/show_bug.cgi?id=105010
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105682 https://bugs.freedesktop.org/show_bug.cgi?id=105682
fdo#106886 https://bugs.freedesktop.org/show_bug.cgi?id=106886
fdo#107713 https://bugs.freedesktop.org/show_bug.cgi?id=107713
fdo#107773 https://bugs.freedesktop.org/show_bug.cgi?id=107773
fdo#107807 https://bugs.freedesktop.org/show_bug.cgi?id=107807
fdo#107815 https://bugs.freedesktop.org/show_bug.cgi?id=107815
fdo#107820 https://bugs.freedesktop.org/show_bug.cgi?id=107820
fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
fdo#108074 https://bugs.freedesktop.org/show_bug.cgi?id=108074
fdo#108145 https://bugs.freedesktop.org/show_bug.cgi?id=108145
fdo#108654 https://bugs.freedesktop.org/show_bug.cgi?id=108654
fdo#108756 https://bugs.freedesktop.org/show_bug.cgi?id=108756
fdo#108784 https://bugs.freedesktop.org/show_bug.cgi?id=108784
fdo#108840 https://bugs.freedesktop.org/show_bug.cgi?id=108840
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133
== Participating hosts (7 -> 7) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_5200 -> Patchwork_10905
CI_DRM_5200: d30879c3f1a18d3b7eeba861f63dc3522e6764ae @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4726: f48bebb15d3d2c1e6382e1f11b0aeac06fae6082 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10905: 7e6b056544d111a5c10a96a18074d14598453e57 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10905/shards.html
_______________________________________________
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:[~2018-11-26 17:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-26 12:28 [PATCH] drm/i915/ringbuffer: 2-step restart Chris Wilson
2018-11-26 13:12 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-11-26 14:19 ` [PATCH] " Joonas Lahtinen
2018-11-26 14:35 ` Chris Wilson
2018-11-26 17:24 ` ✓ Fi.CI.IGT: success for " 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.