* [Intel-gfx] [PATCH] drm/i915: Reset the interrupt mask on disabling interrupts
@ 2020-10-22 7:16 Chris Wilson
2020-10-22 7:30 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
` (7 more replies)
0 siblings, 8 replies; 12+ messages in thread
From: Chris Wilson @ 2020-10-22 7:16 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson
As we disable the interrupt during suspend, also reset the irq_mask to
short-circuit subsystems that later try to turn off their interrupt
source.
<4>[ 101.816730] i915 0000:00:02.0: drm_WARN_ON(!intel_irqs_enabled(dev_priv))
<4>[ 101.816853] WARNING: CPU: 3 PID: 4241 at drivers/gpu/drm/i915/i915_irq.c:343 ilk_update_display_irq+0xb3/0x130 [i915]
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/i915_irq.c | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 09221ca1ffb2..cbb71fc73313 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -337,17 +337,14 @@ void ilk_update_display_irq(struct drm_i915_private *dev_priv,
u32 new_val;
lockdep_assert_held(&dev_priv->irq_lock);
-
drm_WARN_ON(&dev_priv->drm, enabled_irq_mask & ~interrupt_mask);
- if (drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv)))
- return;
-
new_val = dev_priv->irq_mask;
new_val &= ~interrupt_mask;
new_val |= (~enabled_irq_mask & interrupt_mask);
- if (new_val != dev_priv->irq_mask) {
+ if (new_val != dev_priv->irq_mask &&
+ !drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv))) {
dev_priv->irq_mask = new_val;
I915_WRITE(DEIMR, dev_priv->irq_mask);
POSTING_READ(DEIMR);
@@ -368,19 +365,16 @@ static void bdw_update_port_irq(struct drm_i915_private *dev_priv,
u32 old_val;
lockdep_assert_held(&dev_priv->irq_lock);
-
drm_WARN_ON(&dev_priv->drm, enabled_irq_mask & ~interrupt_mask);
- if (drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv)))
- return;
-
old_val = I915_READ(GEN8_DE_PORT_IMR);
new_val = old_val;
new_val &= ~interrupt_mask;
new_val |= (~enabled_irq_mask & interrupt_mask);
- if (new_val != old_val) {
+ if (new_val != old_val &&
+ !drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv))) {
I915_WRITE(GEN8_DE_PORT_IMR, new_val);
POSTING_READ(GEN8_DE_PORT_IMR);
}
@@ -401,17 +395,14 @@ void bdw_update_pipe_irq(struct drm_i915_private *dev_priv,
u32 new_val;
lockdep_assert_held(&dev_priv->irq_lock);
-
drm_WARN_ON(&dev_priv->drm, enabled_irq_mask & ~interrupt_mask);
- if (drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv)))
- return;
-
new_val = dev_priv->de_irq_mask[pipe];
new_val &= ~interrupt_mask;
new_val |= (~enabled_irq_mask & interrupt_mask);
- if (new_val != dev_priv->de_irq_mask[pipe]) {
+ if (new_val != dev_priv->de_irq_mask[pipe] &&
+ !drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv))) {
dev_priv->de_irq_mask[pipe] = new_val;
I915_WRITE(GEN8_DE_PIPE_IMR(pipe), dev_priv->de_irq_mask[pipe]);
POSTING_READ(GEN8_DE_PIPE_IMR(pipe));
@@ -2951,6 +2942,8 @@ static void ilk_irq_reset(struct drm_i915_private *dev_priv)
struct intel_uncore *uncore = &dev_priv->uncore;
GEN3_IRQ_RESET(uncore, DE);
+ dev_priv->irq_mask = ~0u;
+
if (IS_GEN(dev_priv, 7))
intel_uncore_write(uncore, GEN7_ERR_INT, 0xffffffff);
@@ -3864,6 +3857,7 @@ static void i915_irq_reset(struct drm_i915_private *dev_priv)
i9xx_pipestat_irq_reset(dev_priv);
GEN3_IRQ_RESET(uncore, GEN2_);
+ dev_priv->irq_mask = ~0u;
}
static void i915_irq_postinstall(struct drm_i915_private *dev_priv)
@@ -3970,6 +3964,7 @@ static void i965_irq_reset(struct drm_i915_private *dev_priv)
i9xx_pipestat_irq_reset(dev_priv);
GEN3_IRQ_RESET(uncore, GEN2_);
+ dev_priv->irq_mask = ~0u;
}
static void i965_irq_postinstall(struct drm_i915_private *dev_priv)
--
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] 12+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Reset the interrupt mask on disabling interrupts
2020-10-22 7:16 [Intel-gfx] [PATCH] drm/i915: Reset the interrupt mask on disabling interrupts Chris Wilson
@ 2020-10-22 7:30 ` Patchwork
2020-10-22 7:55 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
` (6 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2020-10-22 7:30 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Reset the interrupt mask on disabling interrupts
URL : https://patchwork.freedesktop.org/series/82945/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
34e2194f7c0a drm/i915: Reset the interrupt mask on disabling interrupts
-:13: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#13:
<4>[ 101.816730] i915 0000:00:02.0: drm_WARN_ON(!intel_irqs_enabled(dev_priv))
total: 0 errors, 1 warnings, 0 checks, 81 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Reset the interrupt mask on disabling interrupts
2020-10-22 7:16 [Intel-gfx] [PATCH] drm/i915: Reset the interrupt mask on disabling interrupts Chris Wilson
2020-10-22 7:30 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
@ 2020-10-22 7:55 ` Patchwork
2020-10-22 10:42 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
` (5 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2020-10-22 7:55 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 3489 bytes --]
== Series Details ==
Series: drm/i915: Reset the interrupt mask on disabling interrupts
URL : https://patchwork.freedesktop.org/series/82945/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9180 -> Patchwork_18763
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/index.html
Known issues
------------
Here are the changes found in Patchwork_18763 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@core_hotunplug@unbind-rebind:
- fi-kbl-soraka: [PASS][1] -> [DMESG-WARN][2] ([i915#1982])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/fi-kbl-soraka/igt@core_hotunplug@unbind-rebind.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/fi-kbl-soraka/igt@core_hotunplug@unbind-rebind.html
#### Possible fixes ####
* igt@kms_chamelium@hdmi-crc-fast:
- fi-kbl-7500u: [DMESG-WARN][3] ([i915#2203]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/fi-kbl-7500u/igt@kms_chamelium@hdmi-crc-fast.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/fi-kbl-7500u/igt@kms_chamelium@hdmi-crc-fast.html
- fi-icl-u2: [FAIL][5] ([i915#1161]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/fi-icl-u2/igt@kms_chamelium@hdmi-crc-fast.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/fi-icl-u2/igt@kms_chamelium@hdmi-crc-fast.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- {fi-kbl-7560u}: [DMESG-WARN][7] ([i915#1982]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/fi-kbl-7560u/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/fi-kbl-7560u/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
- fi-bsw-kefka: [DMESG-WARN][9] ([i915#1982]) -> [PASS][10] +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/fi-bsw-kefka/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/fi-bsw-kefka/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#1161]: https://gitlab.freedesktop.org/drm/intel/issues/1161
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2203]: https://gitlab.freedesktop.org/drm/intel/issues/2203
Participating hosts (45 -> 38)
------------------------------
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_9180 -> Patchwork_18763
CI-20190529: 20190529
CI_DRM_9180: b174cec7fd714a954d4a65088ca53e32ae9cd45e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5822: b4bcf05cb9839037128905deda7146434155cc41 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18763: 34e2194f7c0af3ff5ede47cf9702b2ac3cb61b5a @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
34e2194f7c0a drm/i915: Reset the interrupt mask on disabling interrupts
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/index.html
[-- Attachment #1.2: Type: text/html, Size: 4335 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915: Reset the interrupt mask on disabling interrupts
2020-10-22 7:16 [Intel-gfx] [PATCH] drm/i915: Reset the interrupt mask on disabling interrupts Chris Wilson
2020-10-22 7:30 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2020-10-22 7:55 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
@ 2020-10-22 10:42 ` Patchwork
2020-10-22 11:32 ` [Intel-gfx] [PATCH] " Ville Syrjälä
` (4 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2020-10-22 10:42 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 16056 bytes --]
== Series Details ==
Series: drm/i915: Reset the interrupt mask on disabling interrupts
URL : https://patchwork.freedesktop.org/series/82945/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9180_full -> Patchwork_18763_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_18763_full:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* {igt@core_hotunplug@hotrebind}:
- shard-hsw: NOTRUN -> [WARN][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-hsw5/igt@core_hotunplug@hotrebind.html
Known issues
------------
Here are the changes found in Patchwork_18763_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@core_hotunplug@hotrebind-lateclose:
- shard-snb: [PASS][2] -> [INCOMPLETE][3] ([i915#82])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-snb5/igt@core_hotunplug@hotrebind-lateclose.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-snb7/igt@core_hotunplug@hotrebind-lateclose.html
* igt@gem_exec_reloc@basic-many-active@vecs0:
- shard-glk: [PASS][4] -> [FAIL][5] ([i915#2389]) +1 similar issue
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-glk9/igt@gem_exec_reloc@basic-many-active@vecs0.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-glk6/igt@gem_exec_reloc@basic-many-active@vecs0.html
* igt@gem_userptr_blits@sync-unmap-cycles:
- shard-skl: [PASS][6] -> [TIMEOUT][7] ([i915#2424])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-skl10/igt@gem_userptr_blits@sync-unmap-cycles.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-skl3/igt@gem_userptr_blits@sync-unmap-cycles.html
* igt@i915_pm_rc6_residency@rc6-fence:
- shard-hsw: [PASS][8] -> [WARN][9] ([i915#1519])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-hsw7/igt@i915_pm_rc6_residency@rc6-fence.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-hsw6/igt@i915_pm_rc6_residency@rc6-fence.html
* igt@i915_suspend@debugfs-reader:
- shard-kbl: [PASS][10] -> [INCOMPLETE][11] ([i915#155])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-kbl1/igt@i915_suspend@debugfs-reader.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-kbl4/igt@i915_suspend@debugfs-reader.html
* igt@kms_big_fb@y-tiled-16bpp-rotate-0:
- shard-glk: [PASS][12] -> [FAIL][13] ([i915#1119])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-glk7/igt@kms_big_fb@y-tiled-16bpp-rotate-0.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-glk1/igt@kms_big_fb@y-tiled-16bpp-rotate-0.html
* igt@kms_big_fb@y-tiled-8bpp-rotate-180:
- shard-kbl: [PASS][14] -> [DMESG-WARN][15] ([i915#1982])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-kbl1/igt@kms_big_fb@y-tiled-8bpp-rotate-180.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-kbl4/igt@kms_big_fb@y-tiled-8bpp-rotate-180.html
* igt@kms_cursor_edge_walk@pipe-b-256x256-right-edge:
- shard-skl: [PASS][16] -> [DMESG-WARN][17] ([i915#1982]) +6 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-skl6/igt@kms_cursor_edge_walk@pipe-b-256x256-right-edge.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-skl6/igt@kms_cursor_edge_walk@pipe-b-256x256-right-edge.html
* igt@kms_draw_crc@draw-method-xrgb8888-render-xtiled:
- shard-snb: [PASS][18] -> [FAIL][19] ([i915#54])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-snb5/igt@kms_draw_crc@draw-method-xrgb8888-render-xtiled.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-snb4/igt@kms_draw_crc@draw-method-xrgb8888-render-xtiled.html
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-mmap-wc:
- shard-tglb: [PASS][20] -> [DMESG-WARN][21] ([i915#1982])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-tglb5/igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-mmap-wc.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-tglb7/igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-mmap-wc.html
* igt@kms_plane@plane-panning-bottom-right-pipe-a-planes:
- shard-iclb: [PASS][22] -> [DMESG-WARN][23] ([i915#1982])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-iclb1/igt@kms_plane@plane-panning-bottom-right-pipe-a-planes.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-iclb3/igt@kms_plane@plane-panning-bottom-right-pipe-a-planes.html
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][24] -> [FAIL][25] ([fdo#108145] / [i915#265]) +1 similar issue
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-skl7/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-skl8/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
* igt@kms_plane_cursor@pipe-a-primary-size-256:
- shard-glk: [PASS][26] -> [DMESG-WARN][27] ([i915#1982]) +1 similar issue
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-glk4/igt@kms_plane_cursor@pipe-a-primary-size-256.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-glk2/igt@kms_plane_cursor@pipe-a-primary-size-256.html
* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [PASS][28] -> [SKIP][29] ([fdo#109441]) +1 similar issue
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-iclb5/igt@kms_psr@psr2_cursor_render.html
* igt@kms_setmode@basic:
- shard-apl: [PASS][30] -> [FAIL][31] ([i915#1635] / [i915#31])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-apl3/igt@kms_setmode@basic.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-apl8/igt@kms_setmode@basic.html
#### Possible fixes ####
* igt@core_hotunplug@unbind-rebind:
- shard-iclb: [DMESG-WARN][32] ([i915#1982]) -> [PASS][33]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-iclb4/igt@core_hotunplug@unbind-rebind.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-iclb8/igt@core_hotunplug@unbind-rebind.html
* igt@gem_exec_flush@basic-wb-prw-default:
- shard-skl: [DMESG-WARN][34] ([i915#1982]) -> [PASS][35] +6 similar issues
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-skl1/igt@gem_exec_flush@basic-wb-prw-default.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-skl3/igt@gem_exec_flush@basic-wb-prw-default.html
* igt@gem_exec_schedule@pi-common@bcs0:
- shard-apl: [INCOMPLETE][36] ([i915#1635]) -> [PASS][37]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-apl7/igt@gem_exec_schedule@pi-common@bcs0.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-apl1/igt@gem_exec_schedule@pi-common@bcs0.html
* igt@gem_exec_whisper@basic-contexts-priority-all:
- shard-iclb: [INCOMPLETE][38] -> [PASS][39]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-iclb2/igt@gem_exec_whisper@basic-contexts-priority-all.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-iclb4/igt@gem_exec_whisper@basic-contexts-priority-all.html
* igt@gem_exec_whisper@basic-forked-all:
- shard-glk: [DMESG-WARN][40] ([i915#118] / [i915#95]) -> [PASS][41]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-glk1/igt@gem_exec_whisper@basic-forked-all.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-glk4/igt@gem_exec_whisper@basic-forked-all.html
* igt@gem_exec_whisper@basic-queues-priority-all:
- shard-skl: [FAIL][42] -> [PASS][43]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-skl6/igt@gem_exec_whisper@basic-queues-priority-all.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-skl6/igt@gem_exec_whisper@basic-queues-priority-all.html
* igt@gem_userptr_blits@unsync-unmap-cycles:
- shard-skl: [TIMEOUT][44] ([i915#2424]) -> [PASS][45]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-skl3/igt@gem_userptr_blits@unsync-unmap-cycles.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-skl2/igt@gem_userptr_blits@unsync-unmap-cycles.html
* igt@gen9_exec_parse@allowed-single:
- shard-skl: [DMESG-WARN][46] ([i915#1436] / [i915#716]) -> [PASS][47]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-skl3/igt@gen9_exec_parse@allowed-single.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-skl7/igt@gen9_exec_parse@allowed-single.html
* {igt@kms_async_flips@async-flip-with-page-flip-events}:
- shard-kbl: [FAIL][48] ([i915#2521]) -> [PASS][49]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-kbl4/igt@kms_async_flips@async-flip-with-page-flip-events.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-kbl1/igt@kms_async_flips@async-flip-with-page-flip-events.html
* igt@kms_big_fb@linear-32bpp-rotate-180:
- shard-glk: [DMESG-FAIL][50] ([i915#118] / [i915#95]) -> [PASS][51]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-glk5/igt@kms_big_fb@linear-32bpp-rotate-180.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-glk7/igt@kms_big_fb@linear-32bpp-rotate-180.html
* igt@kms_draw_crc@draw-method-rgb565-pwrite-untiled:
- shard-snb: [SKIP][52] ([fdo#109271]) -> [PASS][53]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-snb5/igt@kms_draw_crc@draw-method-rgb565-pwrite-untiled.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-snb4/igt@kms_draw_crc@draw-method-rgb565-pwrite-untiled.html
* igt@kms_flip@flip-vs-expired-vblank@b-hdmi-a1:
- shard-glk: [FAIL][54] ([i915#79]) -> [PASS][55]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-glk2/igt@kms_flip@flip-vs-expired-vblank@b-hdmi-a1.html
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-glk3/igt@kms_flip@flip-vs-expired-vblank@b-hdmi-a1.html
* igt@kms_frontbuffer_tracking@fbc-modesetfrombusy:
- shard-glk: [FAIL][56] ([i915#49]) -> [PASS][57]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-glk7/igt@kms_frontbuffer_tracking@fbc-modesetfrombusy.html
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-glk1/igt@kms_frontbuffer_tracking@fbc-modesetfrombusy.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-blt:
- shard-tglb: [DMESG-WARN][58] ([i915#1982]) -> [PASS][59]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-tglb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-blt.html
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-tglb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-blt.html
* igt@kms_hdr@bpc-switch:
- shard-skl: [FAIL][60] ([i915#1188]) -> [PASS][61]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-skl1/igt@kms_hdr@bpc-switch.html
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-skl3/igt@kms_hdr@bpc-switch.html
* igt@kms_psr2_su@page_flip:
- shard-iclb: [SKIP][62] ([fdo#109642] / [fdo#111068]) -> [PASS][63]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-iclb8/igt@kms_psr2_su@page_flip.html
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-iclb2/igt@kms_psr2_su@page_flip.html
* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [SKIP][64] ([fdo#109441]) -> [PASS][65] +1 similar issue
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-iclb7/igt@kms_psr@psr2_primary_page_flip.html
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
* igt@perf@polling-parameterized:
- shard-iclb: [FAIL][66] ([i915#1542]) -> [PASS][67]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-iclb5/igt@perf@polling-parameterized.html
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-iclb6/igt@perf@polling-parameterized.html
#### Warnings ####
* igt@i915_pm_dc@dc6-psr:
- shard-skl: [INCOMPLETE][68] ([i915#198]) -> [FAIL][69] ([i915#454])
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9180/shard-skl1/igt@i915_pm_dc@dc6-psr.html
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18763/shard-skl8/igt@i915_pm_dc@dc6-psr.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[i915#1119]: https://gitlab.freedesktop.org/drm/intel/issues/1119
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1519]: https://gitlab.freedesktop.org/drm/intel/issues/1519
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#155]: https://gitlab.freedesktop.org/drm/intel/issues/155
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2389]: https://gitlab.freedesktop.org/drm/intel/issues/2389
[i915#2424]: https://gitlab.freedesktop.org/drm/intel/issues/2424
[i915#2521]: https://gitlab.freedesktop.org/drm/intel/issues/2521
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#82]: https://gitlab.freedesktop.org/drm/intel/issues/82
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (11 -> 11)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_9180 -> Patchwork_18763
CI-20190529: 20190529
CI_DRM_9180: b174cec7fd714a954d4a65088ca53e32ae9cd45e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5822: b4bcf05cb9839037128905deda7146434155cc41 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18763: 34e2194f7c0af3ff5ede47cf9702b2ac3cb61b5a @ 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_18763/index.html
[-- Attachment #1.2: Type: text/html, Size: 18334 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: Reset the interrupt mask on disabling interrupts
2020-10-22 7:16 [Intel-gfx] [PATCH] drm/i915: Reset the interrupt mask on disabling interrupts Chris Wilson
` (2 preceding siblings ...)
2020-10-22 10:42 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
@ 2020-10-22 11:32 ` Ville Syrjälä
2020-10-22 11:38 ` Chris Wilson
2020-10-22 11:42 ` Chris Wilson
` (3 subsequent siblings)
7 siblings, 1 reply; 12+ messages in thread
From: Ville Syrjälä @ 2020-10-22 11:32 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
On Thu, Oct 22, 2020 at 08:16:37AM +0100, Chris Wilson wrote:
> As we disable the interrupt during suspend, also reset the irq_mask to
> short-circuit subsystems that later try to turn off their interrupt
> source.
>
> <4>[ 101.816730] i915 0000:00:02.0: drm_WARN_ON(!intel_irqs_enabled(dev_priv))
> <4>[ 101.816853] WARNING: CPU: 3 PID: 4241 at drivers/gpu/drm/i915/i915_irq.c:343 ilk_update_display_irq+0xb3/0x130 [i915]
Doh. Lack of irq symmetry in suspend vs. resume strikes again :(
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/i915_irq.c | 25 ++++++++++---------------
> 1 file changed, 10 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 09221ca1ffb2..cbb71fc73313 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -337,17 +337,14 @@ void ilk_update_display_irq(struct drm_i915_private *dev_priv,
> u32 new_val;
>
> lockdep_assert_held(&dev_priv->irq_lock);
> -
> drm_WARN_ON(&dev_priv->drm, enabled_irq_mask & ~interrupt_mask);
>
> - if (drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv)))
> - return;
> -
> new_val = dev_priv->irq_mask;
> new_val &= ~interrupt_mask;
> new_val |= (~enabled_irq_mask & interrupt_mask);
>
> - if (new_val != dev_priv->irq_mask) {
> + if (new_val != dev_priv->irq_mask &&
> + !drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv))) {
> dev_priv->irq_mask = new_val;
> I915_WRITE(DEIMR, dev_priv->irq_mask);
> POSTING_READ(DEIMR);
> @@ -368,19 +365,16 @@ static void bdw_update_port_irq(struct drm_i915_private *dev_priv,
> u32 old_val;
>
> lockdep_assert_held(&dev_priv->irq_lock);
> -
> drm_WARN_ON(&dev_priv->drm, enabled_irq_mask & ~interrupt_mask);
>
> - if (drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv)))
> - return;
> -
> old_val = I915_READ(GEN8_DE_PORT_IMR);
>
> new_val = old_val;
> new_val &= ~interrupt_mask;
> new_val |= (~enabled_irq_mask & interrupt_mask);
>
> - if (new_val != old_val) {
> + if (new_val != old_val &&
> + !drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv))) {
> I915_WRITE(GEN8_DE_PORT_IMR, new_val);
> POSTING_READ(GEN8_DE_PORT_IMR);
> }
> @@ -401,17 +395,14 @@ void bdw_update_pipe_irq(struct drm_i915_private *dev_priv,
> u32 new_val;
>
> lockdep_assert_held(&dev_priv->irq_lock);
> -
> drm_WARN_ON(&dev_priv->drm, enabled_irq_mask & ~interrupt_mask);
>
> - if (drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv)))
> - return;
> -
> new_val = dev_priv->de_irq_mask[pipe];
> new_val &= ~interrupt_mask;
> new_val |= (~enabled_irq_mask & interrupt_mask);
>
> - if (new_val != dev_priv->de_irq_mask[pipe]) {
> + if (new_val != dev_priv->de_irq_mask[pipe] &&
> + !drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv))) {
> dev_priv->de_irq_mask[pipe] = new_val;
> I915_WRITE(GEN8_DE_PIPE_IMR(pipe), dev_priv->de_irq_mask[pipe]);
> POSTING_READ(GEN8_DE_PIPE_IMR(pipe));
Not resetting de_irq_mask[] anywhere? Hmm. we seem to be lacking a
gen8_de_irq_reset()...
> @@ -2951,6 +2942,8 @@ static void ilk_irq_reset(struct drm_i915_private *dev_priv)
> struct intel_uncore *uncore = &dev_priv->uncore;
>
> GEN3_IRQ_RESET(uncore, DE);
> + dev_priv->irq_mask = ~0u;
> +
> if (IS_GEN(dev_priv, 7))
> intel_uncore_write(uncore, GEN7_ERR_INT, 0xffffffff);
>
> @@ -3864,6 +3857,7 @@ static void i915_irq_reset(struct drm_i915_private *dev_priv)
> i9xx_pipestat_irq_reset(dev_priv);
>
> GEN3_IRQ_RESET(uncore, GEN2_);
> + dev_priv->irq_mask = ~0u;
> }
>
> static void i915_irq_postinstall(struct drm_i915_private *dev_priv)
> @@ -3970,6 +3964,7 @@ static void i965_irq_reset(struct drm_i915_private *dev_priv)
> i9xx_pipestat_irq_reset(dev_priv);
>
> GEN3_IRQ_RESET(uncore, GEN2_);
> + dev_priv->irq_mask = ~0u;
> }
Missing gen2?
>
> static void i965_irq_postinstall(struct drm_i915_private *dev_priv)
> --
> 2.20.1
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: Reset the interrupt mask on disabling interrupts
2020-10-22 11:32 ` [Intel-gfx] [PATCH] " Ville Syrjälä
@ 2020-10-22 11:38 ` Chris Wilson
0 siblings, 0 replies; 12+ messages in thread
From: Chris Wilson @ 2020-10-22 11:38 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
Quoting Ville Syrjälä (2020-10-22 12:32:52)
> On Thu, Oct 22, 2020 at 08:16:37AM +0100, Chris Wilson wrote:
> > As we disable the interrupt during suspend, also reset the irq_mask to
> > short-circuit subsystems that later try to turn off their interrupt
> > source.
> >
> > <4>[ 101.816730] i915 0000:00:02.0: drm_WARN_ON(!intel_irqs_enabled(dev_priv))
> > <4>[ 101.816853] WARNING: CPU: 3 PID: 4241 at drivers/gpu/drm/i915/i915_irq.c:343 ilk_update_display_irq+0xb3/0x130 [i915]
>
> Doh. Lack of irq symmetry in suspend vs. resume strikes again :(
>
> >
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > ---
> > drivers/gpu/drm/i915/i915_irq.c | 25 ++++++++++---------------
> > 1 file changed, 10 insertions(+), 15 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> > index 09221ca1ffb2..cbb71fc73313 100644
> > --- a/drivers/gpu/drm/i915/i915_irq.c
> > +++ b/drivers/gpu/drm/i915/i915_irq.c
> > @@ -337,17 +337,14 @@ void ilk_update_display_irq(struct drm_i915_private *dev_priv,
> > u32 new_val;
> >
> > lockdep_assert_held(&dev_priv->irq_lock);
> > -
> > drm_WARN_ON(&dev_priv->drm, enabled_irq_mask & ~interrupt_mask);
> >
> > - if (drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv)))
> > - return;
> > -
> > new_val = dev_priv->irq_mask;
> > new_val &= ~interrupt_mask;
> > new_val |= (~enabled_irq_mask & interrupt_mask);
> >
> > - if (new_val != dev_priv->irq_mask) {
> > + if (new_val != dev_priv->irq_mask &&
> > + !drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv))) {
> > dev_priv->irq_mask = new_val;
> > I915_WRITE(DEIMR, dev_priv->irq_mask);
> > POSTING_READ(DEIMR);
> > @@ -368,19 +365,16 @@ static void bdw_update_port_irq(struct drm_i915_private *dev_priv,
> > u32 old_val;
> >
> > lockdep_assert_held(&dev_priv->irq_lock);
> > -
> > drm_WARN_ON(&dev_priv->drm, enabled_irq_mask & ~interrupt_mask);
> >
> > - if (drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv)))
> > - return;
> > -
> > old_val = I915_READ(GEN8_DE_PORT_IMR);
> >
> > new_val = old_val;
> > new_val &= ~interrupt_mask;
> > new_val |= (~enabled_irq_mask & interrupt_mask);
> >
> > - if (new_val != old_val) {
> > + if (new_val != old_val &&
> > + !drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv))) {
> > I915_WRITE(GEN8_DE_PORT_IMR, new_val);
> > POSTING_READ(GEN8_DE_PORT_IMR);
> > }
> > @@ -401,17 +395,14 @@ void bdw_update_pipe_irq(struct drm_i915_private *dev_priv,
> > u32 new_val;
> >
> > lockdep_assert_held(&dev_priv->irq_lock);
> > -
> > drm_WARN_ON(&dev_priv->drm, enabled_irq_mask & ~interrupt_mask);
> >
> > - if (drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv)))
> > - return;
> > -
> > new_val = dev_priv->de_irq_mask[pipe];
> > new_val &= ~interrupt_mask;
> > new_val |= (~enabled_irq_mask & interrupt_mask);
> >
> > - if (new_val != dev_priv->de_irq_mask[pipe]) {
> > + if (new_val != dev_priv->de_irq_mask[pipe] &&
> > + !drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv))) {
> > dev_priv->de_irq_mask[pipe] = new_val;
> > I915_WRITE(GEN8_DE_PIPE_IMR(pipe), dev_priv->de_irq_mask[pipe]);
> > POSTING_READ(GEN8_DE_PIPE_IMR(pipe));
>
> Not resetting de_irq_mask[] anywhere? Hmm. we seem to be lacking a
> gen8_de_irq_reset()...
Maybe I was being a bit optimistic, and erred on the side of sticking to
the simple resets.
> > @@ -2951,6 +2942,8 @@ static void ilk_irq_reset(struct drm_i915_private *dev_priv)
> > struct intel_uncore *uncore = &dev_priv->uncore;
> >
> > GEN3_IRQ_RESET(uncore, DE);
> > + dev_priv->irq_mask = ~0u;
> > +
> > if (IS_GEN(dev_priv, 7))
> > intel_uncore_write(uncore, GEN7_ERR_INT, 0xffffffff);
> >
> > @@ -3864,6 +3857,7 @@ static void i915_irq_reset(struct drm_i915_private *dev_priv)
> > i9xx_pipestat_irq_reset(dev_priv);
> >
> > GEN3_IRQ_RESET(uncore, GEN2_);
> > + dev_priv->irq_mask = ~0u;
> > }
> >
> > static void i915_irq_postinstall(struct drm_i915_private *dev_priv)
> > @@ -3970,6 +3964,7 @@ static void i965_irq_reset(struct drm_i915_private *dev_priv)
> > i9xx_pipestat_irq_reset(dev_priv);
> >
> > GEN3_IRQ_RESET(uncore, GEN2_);
> > + dev_priv->irq_mask = ~0u;
> > }
>
> Missing gen2?
Hmm, I saw GEN2 and assumed it was covered. i8xx_irq_reset() looks
straightforward.
I guess split this patch to only think about dev_priv->irq_mask...
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Intel-gfx] [PATCH] drm/i915: Reset the interrupt mask on disabling interrupts
2020-10-22 7:16 [Intel-gfx] [PATCH] drm/i915: Reset the interrupt mask on disabling interrupts Chris Wilson
` (3 preceding siblings ...)
2020-10-22 11:32 ` [Intel-gfx] [PATCH] " Ville Syrjälä
@ 2020-10-22 11:42 ` Chris Wilson
2020-10-22 17:33 ` Ville Syrjälä
2020-10-22 11:50 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Reset the interrupt mask on disabling interrupts (rev2) Patchwork
` (2 subsequent siblings)
7 siblings, 1 reply; 12+ messages in thread
From: Chris Wilson @ 2020-10-22 11:42 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson
As we disable the interrupt during suspend, also reset the irq_mask to
short-circuit subsystems that later try to turn off their interrupt
source.
<4>[ 101.816730] i915 0000:00:02.0: drm_WARN_ON(!intel_irqs_enabled(dev_priv))
<4>[ 101.816853] WARNING: CPU: 3 PID: 4241 at drivers/gpu/drm/i915/i915_irq.c:343 ilk_update_display_irq+0xb3/0x130 [i915]
v2: Reset irq_mask for i8xx_irq_reset as well, and split patch to focus
on only i915->irq_mask
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/i915_irq.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 09221ca1ffb2..53e67c796d09 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -337,17 +337,14 @@ void ilk_update_display_irq(struct drm_i915_private *dev_priv,
u32 new_val;
lockdep_assert_held(&dev_priv->irq_lock);
-
drm_WARN_ON(&dev_priv->drm, enabled_irq_mask & ~interrupt_mask);
- if (drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv)))
- return;
-
new_val = dev_priv->irq_mask;
new_val &= ~interrupt_mask;
new_val |= (~enabled_irq_mask & interrupt_mask);
- if (new_val != dev_priv->irq_mask) {
+ if (new_val != dev_priv->irq_mask &&
+ !drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv))) {
dev_priv->irq_mask = new_val;
I915_WRITE(DEIMR, dev_priv->irq_mask);
POSTING_READ(DEIMR);
@@ -2951,6 +2948,8 @@ static void ilk_irq_reset(struct drm_i915_private *dev_priv)
struct intel_uncore *uncore = &dev_priv->uncore;
GEN3_IRQ_RESET(uncore, DE);
+ dev_priv->irq_mask = ~0u;
+
if (IS_GEN(dev_priv, 7))
intel_uncore_write(uncore, GEN7_ERR_INT, 0xffffffff);
@@ -3695,6 +3694,7 @@ static void i8xx_irq_reset(struct drm_i915_private *dev_priv)
i9xx_pipestat_irq_reset(dev_priv);
GEN2_IRQ_RESET(uncore);
+ dev_priv->irq_mask = ~0u;
}
static void i8xx_irq_postinstall(struct drm_i915_private *dev_priv)
@@ -3864,6 +3864,7 @@ static void i915_irq_reset(struct drm_i915_private *dev_priv)
i9xx_pipestat_irq_reset(dev_priv);
GEN3_IRQ_RESET(uncore, GEN2_);
+ dev_priv->irq_mask = ~0u;
}
static void i915_irq_postinstall(struct drm_i915_private *dev_priv)
@@ -3970,6 +3971,7 @@ static void i965_irq_reset(struct drm_i915_private *dev_priv)
i9xx_pipestat_irq_reset(dev_priv);
GEN3_IRQ_RESET(uncore, GEN2_);
+ dev_priv->irq_mask = ~0u;
}
static void i965_irq_postinstall(struct drm_i915_private *dev_priv)
--
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] 12+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Reset the interrupt mask on disabling interrupts (rev2)
2020-10-22 7:16 [Intel-gfx] [PATCH] drm/i915: Reset the interrupt mask on disabling interrupts Chris Wilson
` (4 preceding siblings ...)
2020-10-22 11:42 ` Chris Wilson
@ 2020-10-22 11:50 ` Patchwork
2020-10-22 12:15 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-10-22 16:34 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
7 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2020-10-22 11:50 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Reset the interrupt mask on disabling interrupts (rev2)
URL : https://patchwork.freedesktop.org/series/82945/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
57c1554fa7c3 drm/i915: Reset the interrupt mask on disabling interrupts
-:13: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#13:
<4>[ 101.816730] i915 0000:00:02.0: drm_WARN_ON(!intel_irqs_enabled(dev_priv))
total: 0 errors, 1 warnings, 0 checks, 48 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Reset the interrupt mask on disabling interrupts (rev2)
2020-10-22 7:16 [Intel-gfx] [PATCH] drm/i915: Reset the interrupt mask on disabling interrupts Chris Wilson
` (5 preceding siblings ...)
2020-10-22 11:50 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Reset the interrupt mask on disabling interrupts (rev2) Patchwork
@ 2020-10-22 12:15 ` Patchwork
2020-10-22 16:34 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
7 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2020-10-22 12:15 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 3290 bytes --]
== Series Details ==
Series: drm/i915: Reset the interrupt mask on disabling interrupts (rev2)
URL : https://patchwork.freedesktop.org/series/82945/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9182 -> Patchwork_18765
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/index.html
Known issues
------------
Here are the changes found in Patchwork_18765 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_chamelium@hdmi-crc-fast:
- fi-kbl-7500u: [PASS][1] -> [DMESG-WARN][2] ([i915#2203])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/fi-kbl-7500u/igt@kms_chamelium@hdmi-crc-fast.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/fi-kbl-7500u/igt@kms_chamelium@hdmi-crc-fast.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-bsw-kefka: [PASS][3] -> [DMESG-WARN][4] ([i915#1982]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/fi-bsw-kefka/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/fi-bsw-kefka/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
* igt@kms_cursor_legacy@basic-flip-after-cursor-legacy:
- fi-icl-u2: [PASS][5] -> [DMESG-WARN][6] ([i915#1982])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/fi-icl-u2/igt@kms_cursor_legacy@basic-flip-after-cursor-legacy.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/fi-icl-u2/igt@kms_cursor_legacy@basic-flip-after-cursor-legacy.html
#### Possible fixes ####
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- {fi-kbl-7560u}: [DMESG-WARN][7] ([i915#1982]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/fi-kbl-7560u/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/fi-kbl-7560u/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2203]: https://gitlab.freedesktop.org/drm/intel/issues/2203
Participating hosts (45 -> 39)
------------------------------
Additional (1): fi-apl-guc
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_9182 -> Patchwork_18765
CI-20190529: 20190529
CI_DRM_9182: 5d76506480cdfef424b52f63a0d21093b2c78dc4 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5822: b4bcf05cb9839037128905deda7146434155cc41 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18765: 57c1554fa7c3bdc6373a3e10f97d84cc1cce477e @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
57c1554fa7c3 drm/i915: Reset the interrupt mask on disabling interrupts
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/index.html
[-- Attachment #1.2: Type: text/html, Size: 4127 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915: Reset the interrupt mask on disabling interrupts (rev2)
2020-10-22 7:16 [Intel-gfx] [PATCH] drm/i915: Reset the interrupt mask on disabling interrupts Chris Wilson
` (6 preceding siblings ...)
2020-10-22 12:15 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
@ 2020-10-22 16:34 ` Patchwork
7 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2020-10-22 16:34 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 18905 bytes --]
== Series Details ==
Series: drm/i915: Reset the interrupt mask on disabling interrupts (rev2)
URL : https://patchwork.freedesktop.org/series/82945/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_9182_full -> Patchwork_18765_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_18765_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_18765_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_18765_full:
### IGT changes ###
#### Possible regressions ####
* igt@i915_suspend@debugfs-reader:
- shard-skl: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-skl6/igt@i915_suspend@debugfs-reader.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-skl7/igt@i915_suspend@debugfs-reader.html
* igt@kms_ccs@pipe-a-crc-primary-rotation-180:
- shard-skl: [PASS][3] -> [FAIL][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-skl9/igt@kms_ccs@pipe-a-crc-primary-rotation-180.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-skl9/igt@kms_ccs@pipe-a-crc-primary-rotation-180.html
Known issues
------------
Here are the changes found in Patchwork_18765_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@core_hotunplug@hotrebind-lateclose:
- shard-snb: [PASS][5] -> [INCOMPLETE][6] ([i915#82])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-snb4/igt@core_hotunplug@hotrebind-lateclose.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-snb5/igt@core_hotunplug@hotrebind-lateclose.html
* igt@gem_ctx_isolation@preservation-s3@vecs0:
- shard-skl: [PASS][7] -> [INCOMPLETE][8] ([i915#198])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-skl2/igt@gem_ctx_isolation@preservation-s3@vecs0.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-skl6/igt@gem_ctx_isolation@preservation-s3@vecs0.html
* igt@gem_exec_reloc@basic-many-active@vcs0:
- shard-glk: [PASS][9] -> [FAIL][10] ([i915#2389]) +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-glk3/igt@gem_exec_reloc@basic-many-active@vcs0.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-glk9/igt@gem_exec_reloc@basic-many-active@vcs0.html
* igt@gem_exec_whisper@basic-contexts:
- shard-glk: [PASS][11] -> [DMESG-WARN][12] ([i915#118] / [i915#95])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-glk8/igt@gem_exec_whisper@basic-contexts.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-glk3/igt@gem_exec_whisper@basic-contexts.html
* igt@gem_softpin@noreloc-s3:
- shard-snb: [PASS][13] -> [DMESG-WARN][14] ([i915#42])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-snb7/igt@gem_softpin@noreloc-s3.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-snb2/igt@gem_softpin@noreloc-s3.html
* igt@i915_pm_rc6_residency@rc6-fence:
- shard-hsw: [PASS][15] -> [WARN][16] ([i915#1519])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-hsw8/igt@i915_pm_rc6_residency@rc6-fence.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-hsw6/igt@i915_pm_rc6_residency@rc6-fence.html
* igt@kms_cursor_edge_walk@pipe-b-256x256-right-edge:
- shard-skl: [PASS][17] -> [DMESG-WARN][18] ([i915#1982]) +5 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-skl9/igt@kms_cursor_edge_walk@pipe-b-256x256-right-edge.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-skl6/igt@kms_cursor_edge_walk@pipe-b-256x256-right-edge.html
* igt@kms_dp_aux_dev:
- shard-iclb: [PASS][19] -> [DMESG-WARN][20] ([i915#2344])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-iclb1/igt@kms_dp_aux_dev.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-iclb7/igt@kms_dp_aux_dev.html
* igt@kms_flip@plain-flip-ts-check-interruptible@a-edp1:
- shard-skl: [PASS][21] -> [FAIL][22] ([i915#2122]) +1 similar issue
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-skl4/igt@kms_flip@plain-flip-ts-check-interruptible@a-edp1.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-skl7/igt@kms_flip@plain-flip-ts-check-interruptible@a-edp1.html
* igt@kms_frontbuffer_tracking@fbc-1p-shrfb-fliptrack:
- shard-snb: [PASS][23] -> [SKIP][24] ([fdo#109271]) +2 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-snb5/igt@kms_frontbuffer_tracking@fbc-1p-shrfb-fliptrack.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-snb2/igt@kms_frontbuffer_tracking@fbc-1p-shrfb-fliptrack.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-indfb-draw-blt:
- shard-tglb: [PASS][25] -> [DMESG-WARN][26] ([i915#1982]) +2 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-tglb6/igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-indfb-draw-blt.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-tglb5/igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-indfb-draw-blt.html
* igt@kms_hdr@bpc-switch:
- shard-skl: [PASS][27] -> [FAIL][28] ([i915#1188])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-skl6/igt@kms_hdr@bpc-switch.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-skl7/igt@kms_hdr@bpc-switch.html
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes:
- shard-kbl: [PASS][29] -> [DMESG-WARN][30] ([i915#180])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-kbl1/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-kbl4/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [PASS][31] -> [FAIL][32] ([fdo#108145] / [i915#265])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-skl2/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-skl4/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [PASS][33] -> [SKIP][34] ([fdo#109642] / [fdo#111068])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-iclb2/igt@kms_psr2_su@frontbuffer.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-iclb5/igt@kms_psr2_su@frontbuffer.html
* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [PASS][35] -> [SKIP][36] ([fdo#109441]) +2 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-iclb5/igt@kms_psr@psr2_primary_page_flip.html
* igt@kms_universal_plane@universal-plane-gen9-features-pipe-a:
- shard-kbl: [PASS][37] -> [DMESG-WARN][38] ([i915#1982])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-kbl4/igt@kms_universal_plane@universal-plane-gen9-features-pipe-a.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-kbl6/igt@kms_universal_plane@universal-plane-gen9-features-pipe-a.html
* igt@perf@polling-parameterized:
- shard-skl: [PASS][39] -> [FAIL][40] ([i915#1542])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-skl1/igt@perf@polling-parameterized.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-skl4/igt@perf@polling-parameterized.html
* igt@perf_pmu@module-unload:
- shard-iclb: [PASS][41] -> [DMESG-WARN][42] ([i915#1982])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-iclb5/igt@perf_pmu@module-unload.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-iclb6/igt@perf_pmu@module-unload.html
#### Possible fixes ####
* igt@gem_exec_reloc@basic-many-active@rcs0:
- shard-snb: [FAIL][43] ([i915#2389]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-snb4/igt@gem_exec_reloc@basic-many-active@rcs0.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-snb2/igt@gem_exec_reloc@basic-many-active@rcs0.html
* igt@gem_exec_whisper@basic-queues:
- shard-iclb: [INCOMPLETE][45] -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-iclb8/igt@gem_exec_whisper@basic-queues.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-iclb3/igt@gem_exec_whisper@basic-queues.html
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [FAIL][47] ([i915#454]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-iclb2/igt@i915_pm_dc@dc6-psr.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-iclb6/igt@i915_pm_dc@dc6-psr.html
* {igt@kms_async_flips@async-flip-with-page-flip-events}:
- shard-kbl: [FAIL][49] ([i915#2521]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-kbl4/igt@kms_async_flips@async-flip-with-page-flip-events.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-kbl6/igt@kms_async_flips@async-flip-with-page-flip-events.html
- shard-glk: [FAIL][51] ([i915#2521]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-glk2/igt@kms_async_flips@async-flip-with-page-flip-events.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-glk8/igt@kms_async_flips@async-flip-with-page-flip-events.html
- shard-tglb: [FAIL][53] ([i915#2521]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-tglb1/igt@kms_async_flips@async-flip-with-page-flip-events.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-tglb7/igt@kms_async_flips@async-flip-with-page-flip-events.html
* igt@kms_big_fb@y-tiled-16bpp-rotate-0:
- shard-skl: [FAIL][55] ([i915#1119]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-skl9/igt@kms_big_fb@y-tiled-16bpp-rotate-0.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-skl9/igt@kms_big_fb@y-tiled-16bpp-rotate-0.html
* igt@kms_cursor_legacy@cursor-vs-flip-atomic-transitions-varying-size:
- shard-skl: [DMESG-WARN][57] ([i915#1982]) -> [PASS][58] +5 similar issues
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-skl7/igt@kms_cursor_legacy@cursor-vs-flip-atomic-transitions-varying-size.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-skl7/igt@kms_cursor_legacy@cursor-vs-flip-atomic-transitions-varying-size.html
* igt@kms_flip@2x-flip-vs-absolute-wf_vblank@ab-vga1-hdmi-a1:
- shard-hsw: [DMESG-WARN][59] ([i915#1982]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-hsw6/igt@kms_flip@2x-flip-vs-absolute-wf_vblank@ab-vga1-hdmi-a1.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-hsw8/igt@kms_flip@2x-flip-vs-absolute-wf_vblank@ab-vga1-hdmi-a1.html
* igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a2:
- shard-glk: [FAIL][61] ([i915#79]) -> [PASS][62] +1 similar issue
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-glk9/igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a2.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-glk5/igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a2.html
* igt@kms_flip@flip-vs-suspend-interruptible@c-dp1:
- shard-kbl: [DMESG-WARN][63] ([i915#180]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-kbl7/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-kbl6/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html
* igt@kms_flip_tiling@flip-changes-tiling:
- shard-apl: [DMESG-WARN][65] ([i915#1635] / [i915#1982]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-apl7/igt@kms_flip_tiling@flip-changes-tiling.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-apl3/igt@kms_flip_tiling@flip-changes-tiling.html
* igt@kms_frontbuffer_tracking@fbc-modesetfrombusy:
- shard-snb: [FAIL][67] ([i915#2546]) -> [PASS][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-snb4/igt@kms_frontbuffer_tracking@fbc-modesetfrombusy.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-snb5/igt@kms_frontbuffer_tracking@fbc-modesetfrombusy.html
* igt@kms_frontbuffer_tracking@fbc-stridechange:
- shard-tglb: [DMESG-WARN][69] ([i915#1982]) -> [PASS][70] +3 similar issues
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-tglb8/igt@kms_frontbuffer_tracking@fbc-stridechange.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-tglb1/igt@kms_frontbuffer_tracking@fbc-stridechange.html
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes:
- shard-iclb: [DMESG-WARN][71] ([i915#1982]) -> [PASS][72]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-iclb6/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-iclb7/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-skl: [FAIL][73] ([fdo#108145] / [i915#265]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-skl2/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-skl10/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [SKIP][75] ([fdo#109441]) -> [PASS][76] +1 similar issue
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-iclb7/igt@kms_psr@psr2_sprite_plane_move.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
* igt@prime_vgem@coherency-blt:
- shard-hsw: [FAIL][77] -> [PASS][78]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-hsw1/igt@prime_vgem@coherency-blt.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-hsw1/igt@prime_vgem@coherency-blt.html
#### Warnings ####
* igt@kms_content_protection@atomic-dpms:
- shard-apl: [TIMEOUT][79] ([i915#1319] / [i915#1635]) -> [FAIL][80] ([fdo#110321] / [fdo#110336] / [i915#1635])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-apl8/igt@kms_content_protection@atomic-dpms.html
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-apl3/igt@kms_content_protection@atomic-dpms.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-skl: [DMESG-WARN][81] ([i915#1982]) -> [DMESG-FAIL][82] ([i915#1982])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9182/shard-skl6/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18765/shard-skl2/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110321]: https://bugs.freedesktop.org/show_bug.cgi?id=110321
[fdo#110336]: https://bugs.freedesktop.org/show_bug.cgi?id=110336
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[i915#1119]: https://gitlab.freedesktop.org/drm/intel/issues/1119
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319
[i915#1519]: https://gitlab.freedesktop.org/drm/intel/issues/1519
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2344]: https://gitlab.freedesktop.org/drm/intel/issues/2344
[i915#2389]: https://gitlab.freedesktop.org/drm/intel/issues/2389
[i915#2521]: https://gitlab.freedesktop.org/drm/intel/issues/2521
[i915#2546]: https://gitlab.freedesktop.org/drm/intel/issues/2546
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#42]: https://gitlab.freedesktop.org/drm/intel/issues/42
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#82]: https://gitlab.freedesktop.org/drm/intel/issues/82
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (11 -> 11)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_9182 -> Patchwork_18765
CI-20190529: 20190529
CI_DRM_9182: 5d76506480cdfef424b52f63a0d21093b2c78dc4 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5822: b4bcf05cb9839037128905deda7146434155cc41 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18765: 57c1554fa7c3bdc6373a3e10f97d84cc1cce477e @ 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_18765/index.html
[-- Attachment #1.2: Type: text/html, Size: 21802 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: Reset the interrupt mask on disabling interrupts
2020-10-22 11:42 ` Chris Wilson
@ 2020-10-22 17:33 ` Ville Syrjälä
2020-10-22 18:48 ` Chris Wilson
0 siblings, 1 reply; 12+ messages in thread
From: Ville Syrjälä @ 2020-10-22 17:33 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
On Thu, Oct 22, 2020 at 12:42:46PM +0100, Chris Wilson wrote:
> As we disable the interrupt during suspend, also reset the irq_mask to
> short-circuit subsystems that later try to turn off their interrupt
> source.
>
> <4>[ 101.816730] i915 0000:00:02.0: drm_WARN_ON(!intel_irqs_enabled(dev_priv))
> <4>[ 101.816853] WARNING: CPU: 3 PID: 4241 at drivers/gpu/drm/i915/i915_irq.c:343 ilk_update_display_irq+0xb3/0x130 [i915]
>
> v2: Reset irq_mask for i8xx_irq_reset as well, and split patch to focus
> on only i915->irq_mask
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/i915_irq.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 09221ca1ffb2..53e67c796d09 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -337,17 +337,14 @@ void ilk_update_display_irq(struct drm_i915_private *dev_priv,
> u32 new_val;
>
> lockdep_assert_held(&dev_priv->irq_lock);
> -
> drm_WARN_ON(&dev_priv->drm, enabled_irq_mask & ~interrupt_mask);
>
> - if (drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv)))
> - return;
> -
> new_val = dev_priv->irq_mask;
> new_val &= ~interrupt_mask;
> new_val |= (~enabled_irq_mask & interrupt_mask);
>
> - if (new_val != dev_priv->irq_mask) {
> + if (new_val != dev_priv->irq_mask &&
> + !drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv))) {
> dev_priv->irq_mask = new_val;
> I915_WRITE(DEIMR, dev_priv->irq_mask);
> POSTING_READ(DEIMR);
> @@ -2951,6 +2948,8 @@ static void ilk_irq_reset(struct drm_i915_private *dev_priv)
> struct intel_uncore *uncore = &dev_priv->uncore;
>
> GEN3_IRQ_RESET(uncore, DE);
> + dev_priv->irq_mask = ~0u;
> +
> if (IS_GEN(dev_priv, 7))
> intel_uncore_write(uncore, GEN7_ERR_INT, 0xffffffff);
>
> @@ -3695,6 +3694,7 @@ static void i8xx_irq_reset(struct drm_i915_private *dev_priv)
> i9xx_pipestat_irq_reset(dev_priv);
>
> GEN2_IRQ_RESET(uncore);
> + dev_priv->irq_mask = ~0u;
> }
>
> static void i8xx_irq_postinstall(struct drm_i915_private *dev_priv)
> @@ -3864,6 +3864,7 @@ static void i915_irq_reset(struct drm_i915_private *dev_priv)
> i9xx_pipestat_irq_reset(dev_priv);
>
> GEN3_IRQ_RESET(uncore, GEN2_);
> + dev_priv->irq_mask = ~0u;
> }
>
> static void i915_irq_postinstall(struct drm_i915_private *dev_priv)
> @@ -3970,6 +3971,7 @@ static void i965_irq_reset(struct drm_i915_private *dev_priv)
> i9xx_pipestat_irq_reset(dev_priv);
>
> GEN3_IRQ_RESET(uncore, GEN2_);
> + dev_priv->irq_mask = ~0u;
> }
>
> static void i965_irq_postinstall(struct drm_i915_private *dev_priv)
> --
> 2.20.1
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: Reset the interrupt mask on disabling interrupts
2020-10-22 17:33 ` Ville Syrjälä
@ 2020-10-22 18:48 ` Chris Wilson
0 siblings, 0 replies; 12+ messages in thread
From: Chris Wilson @ 2020-10-22 18:48 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
Quoting Ville Syrjälä (2020-10-22 18:33:43)
> On Thu, Oct 22, 2020 at 12:42:46PM +0100, Chris Wilson wrote:
> > As we disable the interrupt during suspend, also reset the irq_mask to
> > short-circuit subsystems that later try to turn off their interrupt
> > source.
> >
> > <4>[ 101.816730] i915 0000:00:02.0: drm_WARN_ON(!intel_irqs_enabled(dev_priv))
> > <4>[ 101.816853] WARNING: CPU: 3 PID: 4241 at drivers/gpu/drm/i915/i915_irq.c:343 ilk_update_display_irq+0xb3/0x130 [i915]
> >
> > v2: Reset irq_mask for i8xx_irq_reset as well, and split patch to focus
> > on only i915->irq_mask
> >
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
And fingers crossed for fi-ilk-m making a speedy recovery.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2020-10-22 18:48 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-22 7:16 [Intel-gfx] [PATCH] drm/i915: Reset the interrupt mask on disabling interrupts Chris Wilson
2020-10-22 7:30 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2020-10-22 7:55 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-10-22 10:42 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2020-10-22 11:32 ` [Intel-gfx] [PATCH] " Ville Syrjälä
2020-10-22 11:38 ` Chris Wilson
2020-10-22 11:42 ` Chris Wilson
2020-10-22 17:33 ` Ville Syrjälä
2020-10-22 18:48 ` Chris Wilson
2020-10-22 11:50 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Reset the interrupt mask on disabling interrupts (rev2) Patchwork
2020-10-22 12:15 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-10-22 16:34 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " 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.