* [PATCH] drm/i915/guc: Flush the residual log capture after disabling
@ 2019-02-21 12:32 Chris Wilson
2019-02-21 15:10 ` ✓ Fi.CI.BAT: success for " Patchwork
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Chris Wilson @ 2019-02-21 12:32 UTC (permalink / raw)
To: intel-gfx
After we have marked the log capture as disabled, then flush the log
capture worker so that it will not re-queue itself.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109716
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/intel_guc_log.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_guc_log.c b/drivers/gpu/drm/i915/intel_guc_log.c
index 806fdfd7c78a..020eeac6d228 100644
--- a/drivers/gpu/drm/i915/intel_guc_log.c
+++ b/drivers/gpu/drm/i915/intel_guc_log.c
@@ -241,7 +241,7 @@ static void guc_read_update_log_buffer(struct intel_guc_log *log)
mutex_lock(&log->relay.lock);
- if (WARN_ON(!intel_guc_log_relay_enabled(log)))
+ if (!intel_guc_log_relay_enabled(log))
goto out_unlock;
/* Get the pointer to shared GuC log buffer */
@@ -621,13 +621,14 @@ void intel_guc_log_relay_flush(struct intel_guc_log *log)
void intel_guc_log_relay_close(struct intel_guc_log *log)
{
guc_log_disable_flush_events(log);
- flush_work(&log->relay.flush_work);
mutex_lock(&log->relay.lock);
GEM_BUG_ON(!intel_guc_log_relay_enabled(log));
guc_log_unmap(log);
guc_log_relay_destroy(log);
mutex_unlock(&log->relay.lock);
+
+ flush_work(&log->relay.flush_work);
}
void intel_guc_log_handle_flush_event(struct intel_guc_log *log)
--
2.20.1
_______________________________________________
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/guc: Flush the residual log capture after disabling
2019-02-21 12:32 [PATCH] drm/i915/guc: Flush the residual log capture after disabling Chris Wilson
@ 2019-02-21 15:10 ` Patchwork
2019-02-21 16:24 ` [PATCH] " Mika Kuoppala
2019-02-22 0:27 ` ✓ Fi.CI.IGT: success for " Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2019-02-21 15:10 UTC (permalink / raw)
To: intel-gfx
== Series Details ==
Series: drm/i915/guc: Flush the residual log capture after disabling
URL : https://patchwork.freedesktop.org/series/57025/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5648 -> Patchwork_12272
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/57025/revisions/1/mbox/
Known issues
------------
Here are the changes found in Patchwork_12272 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_cs_nop@fork-gfx0:
- fi-icl-u2: NOTRUN -> SKIP [fdo#109315] +17
* igt@gem_exec_basic@readonly-bsd1:
- fi-icl-u2: NOTRUN -> SKIP [fdo#109276] +7
* igt@gem_exec_parse@basic-allowed:
- fi-icl-u2: NOTRUN -> SKIP [fdo#109289] +1
* igt@i915_selftest@live_contexts:
- fi-icl-u2: NOTRUN -> DMESG-FAIL [fdo#108569]
* igt@i915_selftest@live_execlists:
- fi-apl-guc: PASS -> INCOMPLETE [fdo#103927] / [fdo#109720]
* igt@i915_selftest@live_hangcheck:
- fi-kbl-7560u: PASS -> INCOMPLETE [fdo#108044] / [fdo#108744]
* igt@kms_busy@basic-flip-c:
- fi-blb-e6850: NOTRUN -> SKIP [fdo#109271] / [fdo#109278]
* igt@kms_chamelium@dp-edid-read:
- fi-icl-u2: NOTRUN -> SKIP [fdo#109316] +2
* igt@kms_chamelium@hdmi-crc-fast:
- fi-icl-u2: NOTRUN -> FAIL [fdo#109635 ]
* igt@kms_chamelium@vga-hpd-fast:
- fi-icl-u2: NOTRUN -> SKIP [fdo#109309] +1
* igt@kms_force_connector_basic@prune-stale-modes:
- fi-icl-u2: NOTRUN -> SKIP [fdo#109285] +3
* igt@kms_frontbuffer_tracking@basic:
- fi-icl-u2: NOTRUN -> FAIL [fdo#103167]
* igt@kms_pipe_crc_basic@hang-read-crc-pipe-c:
- fi-blb-e6850: NOTRUN -> SKIP [fdo#109271] +48
* igt@runner@aborted:
- fi-apl-guc: NOTRUN -> FAIL [fdo#108622] / [fdo#109720]
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s4-devices:
- fi-blb-e6850: INCOMPLETE [fdo#107718] -> PASS
* igt@prime_self_import@basic-with_one_bo:
- fi-gdg-551: FAIL -> PASS
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#108044]: https://bugs.freedesktop.org/show_bug.cgi?id=108044
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#108622]: https://bugs.freedesktop.org/show_bug.cgi?id=108622
[fdo#108744]: https://bugs.freedesktop.org/show_bug.cgi?id=108744
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109309]: https://bugs.freedesktop.org/show_bug.cgi?id=109309
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#109316]: https://bugs.freedesktop.org/show_bug.cgi?id=109316
[fdo#109635 ]: https://bugs.freedesktop.org/show_bug.cgi?id=109635
[fdo#109720]: https://bugs.freedesktop.org/show_bug.cgi?id=109720
Participating hosts (44 -> 39)
------------------------------
Additional (1): fi-icl-u2
Missing (6): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_5648 -> Patchwork_12272
CI_DRM_5648: 8919844878e5a893cfa7577d79b5b464d77bed7e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4849: e5088c8218d1c2b559a9e1645d34f929d05c3889 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12272: d9b7ca4e4700a6949424be3be02957af799454b2 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
d9b7ca4e4700 drm/i915/guc: Flush the residual log capture after disabling
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12272/
_______________________________________________
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/guc: Flush the residual log capture after disabling
2019-02-21 12:32 [PATCH] drm/i915/guc: Flush the residual log capture after disabling Chris Wilson
2019-02-21 15:10 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2019-02-21 16:24 ` Mika Kuoppala
2019-02-21 16:33 ` Chris Wilson
2019-02-22 0:27 ` ✓ Fi.CI.IGT: success for " Patchwork
2 siblings, 1 reply; 5+ messages in thread
From: Mika Kuoppala @ 2019-02-21 16:24 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
Chris Wilson <chris@chris-wilson.co.uk> writes:
> After we have marked the log capture as disabled, then flush the log
> capture worker so that it will not re-queue itself.
It is not the worker that re-queues so remove the re-queue part.
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109716
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
> drivers/gpu/drm/i915/intel_guc_log.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_guc_log.c b/drivers/gpu/drm/i915/intel_guc_log.c
> index 806fdfd7c78a..020eeac6d228 100644
> --- a/drivers/gpu/drm/i915/intel_guc_log.c
> +++ b/drivers/gpu/drm/i915/intel_guc_log.c
> @@ -241,7 +241,7 @@ static void guc_read_update_log_buffer(struct intel_guc_log *log)
>
> mutex_lock(&log->relay.lock);
>
> - if (WARN_ON(!intel_guc_log_relay_enabled(log)))
> + if (!intel_guc_log_relay_enabled(log))
> goto out_unlock;
>
> /* Get the pointer to shared GuC log buffer */
> @@ -621,13 +621,14 @@ void intel_guc_log_relay_flush(struct intel_guc_log *log)
> void intel_guc_log_relay_close(struct intel_guc_log *log)
> {
> guc_log_disable_flush_events(log);
> - flush_work(&log->relay.flush_work);
>
> mutex_lock(&log->relay.lock);
> GEM_BUG_ON(!intel_guc_log_relay_enabled(log));
> guc_log_unmap(log);
> guc_log_relay_destroy(log);
> mutex_unlock(&log->relay.lock);
> +
> + flush_work(&log->relay.flush_work);
> }
>
> void intel_guc_log_handle_flush_event(struct intel_guc_log *log)
> --
> 2.20.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
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/guc: Flush the residual log capture after disabling
2019-02-21 16:24 ` [PATCH] " Mika Kuoppala
@ 2019-02-21 16:33 ` Chris Wilson
0 siblings, 0 replies; 5+ messages in thread
From: Chris Wilson @ 2019-02-21 16:33 UTC (permalink / raw)
To: Mika Kuoppala, intel-gfx
Quoting Mika Kuoppala (2019-02-21 16:24:06)
> Chris Wilson <chris@chris-wilson.co.uk> writes:
>
> > After we have marked the log capture as disabled, then flush the log
> > capture worker so that it will not re-queue itself.
>
> It is not the worker that re-queues so remove the re-queue part.
Yeah, we are definitely missing a synchronize_irq() after
guc_log_disable_flush_events() as well.
> Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Care to keep the r-b with
> > @@ -621,13 +621,14 @@ void intel_guc_log_relay_flush(struct intel_guc_log *log)
> > void intel_guc_log_relay_close(struct intel_guc_log *log)
> > {
> > guc_log_disable_flush_events(log);
+ synchronize_irq(i915->drm.irq);
?
-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/guc: Flush the residual log capture after disabling
2019-02-21 12:32 [PATCH] drm/i915/guc: Flush the residual log capture after disabling Chris Wilson
2019-02-21 15:10 ` ✓ Fi.CI.BAT: success for " Patchwork
2019-02-21 16:24 ` [PATCH] " Mika Kuoppala
@ 2019-02-22 0:27 ` Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2019-02-22 0:27 UTC (permalink / raw)
To: intel-gfx
== Series Details ==
Series: drm/i915/guc: Flush the residual log capture after disabling
URL : https://patchwork.freedesktop.org/series/57025/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5648_full -> Patchwork_12272_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_12272_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_busy@extended-semaphore-bsd1:
- shard-iclb: NOTRUN -> SKIP [fdo#109275] / [fdo#109276]
* igt@gem_ctx_param@invalid-param-get:
- shard-kbl: NOTRUN -> FAIL [fdo#109559]
* igt@gem_exec_parse@cmd-crossing-page:
- shard-kbl: NOTRUN -> SKIP [fdo#109271] +24
* igt@gem_exec_schedule@preempt-contexts-bsd2:
- shard-iclb: NOTRUN -> SKIP [fdo#109276] +5
* igt@gem_mocs_settings@mocs-reset-ctx-render:
- shard-iclb: NOTRUN -> SKIP [fdo#109287] +1
* igt@gem_stolen@stolen-fill-purge:
- shard-iclb: NOTRUN -> SKIP [fdo#109277]
* igt@i915_pm_rpm@modeset-lpsp-stress:
- shard-apl: NOTRUN -> SKIP [fdo#109271] +24
* igt@i915_pm_rpm@modeset-non-lpsp-stress:
- shard-iclb: NOTRUN -> SKIP [fdo#109308]
* igt@i915_pm_rpm@system-suspend-devices:
- shard-iclb: NOTRUN -> DMESG-WARN [fdo#107724]
* igt@kms_busy@extended-modeset-hang-oldfb-render-f:
- shard-kbl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +1
* igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-c:
- shard-apl: NOTRUN -> DMESG-WARN [fdo#107956]
* igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-d:
- shard-iclb: NOTRUN -> SKIP [fdo#109278] +1
* igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-e:
- shard-apl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +2
* igt@kms_chamelium@hdmi-edid-read:
- shard-iclb: NOTRUN -> SKIP [fdo#109284]
* igt@kms_cursor_crc@cursor-64x21-sliding:
- shard-iclb: NOTRUN -> FAIL [fdo#103232]
* igt@kms_cursor_legacy@cursorb-vs-flipb-atomic:
- shard-iclb: NOTRUN -> SKIP [fdo#109274] +4
* igt@kms_fbcon_fbt@fbc:
- shard-iclb: PASS -> DMESG-WARN [fdo#109593]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite:
- shard-iclb: PASS -> FAIL [fdo#103167] +3
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-onoff:
- shard-glk: PASS -> FAIL [fdo#103167] +1
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-indfb-pgflip-blt:
- shard-iclb: NOTRUN -> SKIP [fdo#109280] +10
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-fullscreen:
- shard-iclb: NOTRUN -> FAIL [fdo#103167]
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
- shard-iclb: PASS -> INCOMPLETE [fdo#107713]
* igt@kms_plane@plane-position-covered-pipe-a-planes:
- shard-glk: PASS -> FAIL [fdo#103166]
- shard-iclb: PASS -> FAIL [fdo#103166] +2
* igt@kms_plane@plane-position-covered-pipe-c-planes:
- shard-apl: PASS -> FAIL [fdo#103166] +1
* igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb:
- shard-apl: PASS -> FAIL [fdo#108145]
* igt@kms_psr@primary_mmap_cpu:
- shard-glk: NOTRUN -> SKIP [fdo#109271] +7
* igt@prime_nv_pcopy@test3_3:
- shard-iclb: NOTRUN -> SKIP [fdo#109291]
* igt@runner@aborted:
- shard-iclb: NOTRUN -> FAIL [fdo#109593]
#### Possible fixes ####
* igt@gem_exec_big:
- shard-hsw: TIMEOUT [fdo#107937] -> PASS
* igt@i915_pm_rpm@gem-evict-pwrite:
- shard-iclb: INCOMPLETE [fdo#108840] -> PASS
* igt@i915_pm_rpm@gem-execbuf-stress:
- shard-iclb: DMESG-WARN [fdo#107724] -> PASS +2
* igt@i915_selftest@live_workarounds:
- shard-iclb: DMESG-FAIL [fdo#108954] -> PASS
* igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-c:
- shard-iclb: DMESG-WARN [fdo#107956] -> PASS +1
* igt@kms_cursor_crc@cursor-128x128-random:
- shard-apl: FAIL [fdo#103232] -> PASS +2
* igt@kms_cursor_crc@cursor-64x64-suspend:
- shard-apl: FAIL [fdo#103191] / [fdo#103232] -> PASS
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render:
- shard-apl: FAIL [fdo#103167] -> PASS
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-kbl: DMESG-WARN [fdo#103313] -> PASS
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-mmap-gtt:
- shard-iclb: FAIL [fdo#103167] -> PASS +3
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
- shard-glk: INCOMPLETE [fdo#103359] / [k.org#198133] -> PASS
* igt@kms_plane_multiple@atomic-pipe-a-tiling-yf:
- shard-glk: FAIL [fdo#103166] -> PASS
* igt@kms_plane_multiple@atomic-pipe-c-tiling-yf:
- shard-apl: FAIL [fdo#103166] -> PASS +1
- shard-iclb: FAIL [fdo#103166] -> PASS +1
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103313]: https://bugs.freedesktop.org/show_bug.cgi?id=103313
[fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#107937]: https://bugs.freedesktop.org/show_bug.cgi?id=107937
[fdo#107956]: https://bugs.freedesktop.org/show_bug.cgi?id=107956
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108840]: https://bugs.freedesktop.org/show_bug.cgi?id=108840
[fdo#108954]: https://bugs.freedesktop.org/show_bug.cgi?id=108954
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109275]: https://bugs.freedesktop.org/show_bug.cgi?id=109275
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109277]: https://bugs.freedesktop.org/show_bug.cgi?id=109277
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109287]: https://bugs.freedesktop.org/show_bug.cgi?id=109287
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109308]: https://bugs.freedesktop.org/show_bug.cgi?id=109308
[fdo#109559]: https://bugs.freedesktop.org/show_bug.cgi?id=109559
[fdo#109593]: https://bugs.freedesktop.org/show_bug.cgi?id=109593
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
Participating hosts (6 -> 5)
------------------------------
Missing (1): shard-skl
Build changes
-------------
* Linux: CI_DRM_5648 -> Patchwork_12272
CI_DRM_5648: 8919844878e5a893cfa7577d79b5b464d77bed7e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4849: e5088c8218d1c2b559a9e1645d34f929d05c3889 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12272: d9b7ca4e4700a6949424be3be02957af799454b2 @ 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_12272/
_______________________________________________
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:[~2019-02-22 0:27 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-21 12:32 [PATCH] drm/i915/guc: Flush the residual log capture after disabling Chris Wilson
2019-02-21 15:10 ` ✓ Fi.CI.BAT: success for " Patchwork
2019-02-21 16:24 ` [PATCH] " Mika Kuoppala
2019-02-21 16:33 ` Chris Wilson
2019-02-22 0:27 ` ✓ 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.