drm/i915: IRQ fixes
Subsystems (2)
v4 cover drm/i915: IRQ fixes
Fix a bug in the usage of IRQs and cleanup references to the DRM IRQ midlayer.
Preferably this patchset would be merged through drm-misc-next.
v4:
* switch IRQ code to intel_synchronize_irq() (Daniel)
v3:
* also use intel_synchronize_hardirq() from other callsite
v2:
* split patch
* also fix comment
* add intel_synchronize_hardirq() (Ville)
* update Fixes tag (Daniel)
Thomas Zimmermann (2):
drm/i915: Use the correct IRQ during resume drm/i915: Drop all references to DRM IRQ midlayer
drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- drivers/gpu/drm/i915/gt/intel_ring_submission.c | 2 +- drivers/gpu/drm/i915/i915_drv.c | 1 - drivers/gpu/drm/i915/i915_irq.c | 5 ----- 4 files changed, 2 insertions(+), 8 deletions(-)
base-commit: 67f5a18128770817e4218a9e496d2bf5047c51e8 --
2.32.0
PATCH v4 1/2 drm/i915: Use the correct IRQ during resume
The code in xcs_resume() probably didn't work as intended. It uses struct drm_device.irq, which is allocated to 0, but never initialized by i915 to the device's interrupt number.
Change all calls to synchronize_hardirq() to intel_synchronize_irq(), which uses the correct interrupt. _hardirq() functions are not needed in this context.
v4:
* switch everything to intel_synchronize_irq() (Daniel)
v3:
* also use intel_synchronize_hardirq() at another callsite
v2:
* wrap irq code in intel_synchronize_hardirq() (Ville)
--- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- drivers/gpu/drm/i915/gt/intel_ring_submission.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gt/intel_engine_cs.c +1 -1
@@ -1229,7 +1229,7 @@ bool intel_engine_is_idle(struct intel_engine_cs *engine)return true;/* Waiting to drain ELSP? */ -synchronize_hardirq (to_pci_dev (engine->i915->drm.dev)->irq); +intel_synchronize_irq (engine->i915);intel_engine_flush_submission (engine);/* ELSP is empty, but there are ready requests? E.g. after reset */
drivers/gpu/drm/i915/gt/intel_ring_submission.c +1 -1
@@ -185,7 +185,7 @@ static int xcs_resume(struct intel_engine_cs *engine) ring->head, ring->tail);/* Double check the ring is empty & disabled before we resume */ -synchronize_hardirq (engine->i915->drm.irq); +intel_synchronize_irq (engine->i915);if (!stop_ring (engine)) goto err;
Signature · 6 lines
2.32.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 2/2 drm/i915: Drop all references to DRM IRQ midlayer
In reply to Thomas ZimmermannRemove all references to DRM's IRQ midlayer. i915 uses Linux' interrupt functions directly.
v2:
* also remove an outdated comment
* move IRQ fix into separate patch
* update Fixes tag (Daniel)
--- drivers/gpu/drm/i915/i915_drv.c | 1 - drivers/gpu/drm/i915/i915_irq.c | 5 ----- 2 files changed, 6 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +0 -1
@@ -42,7 +42,6 @@#include <drm/drm_aperture.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_ioctl.h> -#include <drm/drm_irq.h> #include <drm/drm_managed.h> #include <drm/drm_probe_helper.h>
drivers/gpu/drm/i915/i915_irq.c +0 -5
@@ -33,7 +33,6 @@#include <linux/sysrq.h> #include <drm/drm_drv.h> -#include <drm/drm_irq.h> #include "display/intel_de.h" #include "display/intel_display_types.h"
@@ -4564,10 +4563,6 @@ void intel_runtime_pm_enable_interrupts(struct drm_i915_private *dev_priv)bool intel_irqs_enabled (struct drm_i915_private *dev_priv) { -/* -* We only use drm_irq_uninstall() at unload and VT switch, so -* this is the only thing we need to check. -*/ return dev_priv->runtime_pm.irqs_enabled; }
Signature · 1 line
2.32.0
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: IRQ fixes (rev3)
In reply to Thomas Zimmermann== Series Details ==
== Series Details ==
Series: drm/i915: IRQ fixes (rev3)
URL : https://patchwork.freedesktop.org/series/92053/
State : warning
== Summary ==
$ dim sparse --fast origin/drm-tip Sparse version: v0.6.2 Fast mode used, each commit won't be checked separately. - +drivers/gpu/drm/i915/gt/intel_ring_submission.c:1207:24: warning: Using plain integer as NULL pointer
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: IRQ fixes (rev3)
In reply to Thomas Zimmermann== Series Details ==
== Series Details ==
Series: drm/i915: IRQ fixes (rev3)
URL : https://patchwork.freedesktop.org/series/92053/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_10296 -> Patchwork_20502
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_20502 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_20502, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20502/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_20502:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live@workarounds:
- fi-ivb-3770: [PASS][1] -> [DMESG-FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10296/fi-ivb-3770/igt@i915_selftest@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20502/fi-ivb-3770/igt@i915_selftest@[email protected]
Known issues
------------
Here are the changes found in Patchwork_20502 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_cs_nop@sync-fork-compute0:
- fi-snb-2600: NOTRUN -> [SKIP][3] ([fdo#109271]) +17 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20502/fi-snb-2600/igt@amdgpu/[email protected]
* igt@i915_selftest@live@workarounds:
- fi-hsw-4770: [PASS][4] -> [DMESG-FAIL][5] ([i915#2927])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10296/fi-hsw-4770/igt@i915_selftest@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20502/fi-hsw-4770/igt@i915_selftest@[email protected]
* igt@runner@aborted:
- fi-hsw-4770: NOTRUN -> [FAIL][6] ([fdo#109271] / [i915#1436] / [i915#2505])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20502/fi-hsw-4770/igt@[email protected]
- fi-ivb-3770: NOTRUN -> [FAIL][7] ([fdo#109271])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20502/fi-ivb-3770/igt@[email protected]
#### Possible fixes ####
* igt@i915_module_load@reload:
- fi-kbl-soraka: [DMESG-WARN][8] ([i915#1982]) -> [PASS][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10296/fi-kbl-soraka/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20502/fi-kbl-soraka/igt@[email protected]
* igt@i915_selftest@live@hangcheck:
- fi-snb-2600: [INCOMPLETE][10] ([i915#2782]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10296/fi-snb-2600/igt@i915_selftest@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20502/fi-snb-2600/igt@i915_selftest@[email protected]
* igt@kms_flip@basic-flip-vs-wf_vblank@a-dsi1:
- {fi-tgl-dsi}: [DMESG-WARN][12] ([i915#1982]) -> [PASS][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10296/fi-tgl-dsi/igt@kms_flip@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20502/fi-tgl-dsi/igt@kms_flip@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2505]: https://gitlab.freedesktop.org/drm/intel/issues/2505
[i915#2782]: https://gitlab.freedesktop.org/drm/intel/issues/2782
[i915#2927]: https://gitlab.freedesktop.org/drm/intel/issues/2927
[i915#3717]: https://gitlab.freedesktop.org/drm/intel/issues/3717
Participating hosts (37 -> 35)
------------------------------
Missing (2): fi-bsw-cyan fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_10296 -> Patchwork_20502
CI-20190529: 20190529
CI_DRM_10296: 1ad092a7879a55938159b58a5b662370cab95ec8 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6125: 5bb62cb290fa32777934de4b39e107ccd282f7e8 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_20502: 21c6e6f45c89cd7f4f38e9a6ef4992b6a5204031 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
21c6e6f45c89 drm/i915: Drop all references to DRM IRQ midlayer 1b2c2d630094 drm/i915: Use the correct IRQ during resume
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20502/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: IRQ fixes (rev3)
Am 01.07.21 um 11:43 schrieb Patchwork:
Quoted 32 lines
*Patch Details*
*Series:* drm/i915: IRQ fixes (rev3)
*URL:* https://patchwork.freedesktop.org/series/92053/ <https://patchwork.freedesktop.org/series/92053/>
*State:* failure
*Details:* https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20502/index.html <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20502/index.html>CI Bug Log - changes from
CI_DRM_10296->Patchwork_20502Summary
*FAILURE*
Serious unknown changes coming with
Patchwork_20502absolutely need to be verified manually.If you think the reported changes have nothing to do with the changes introduced in
Patchwork_20502, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20502/index.html
Possible new issues
Here are the unknown changes that may have been introduced in
Patchwork_20502:IGT changes
Quoted 7 lines
Possible regressions
* igt@i915_selftest@live@workarounds:
o fi-ivb-3770: PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10296/fi-ivb-3770/igt@i915_selftest@[email protected]> -> DMESG-FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20502/fi-ivb-3770/igt@i915_selftest@[email protected]>
This looks like it was introduced by v4. v3 didn't have this problem
Quoted 103 lines
Known issues
Here are the changes found in
Patchwork_20502that come from known issues:IGT changes
Issues hit
*
igt@amdgpu/amd_cs_nop@sync-fork-compute0: o fi-snb-2600: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20502/fi-snb-2600/igt@amdgpu/[email protected]> (fdo#109271 <https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +17 similar issues*
igt@i915_selftest@live@workarounds: o fi-hsw-4770: PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10296/fi-hsw-4770/igt@i915_selftest@[email protected]> -> DMESG-FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20502/fi-hsw-4770/igt@i915_selftest@[email protected]> (i915#2927 <https://gitlab.freedesktop.org/drm/intel/issues/2927>)*
igt@runner@aborted: o fi-hsw-4770: NOTRUN -> FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20502/fi-hsw-4770/igt@[email protected]> (fdo#109271 <https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#1436 <https://gitlab.freedesktop.org/drm/intel/issues/1436> / i915#2505 <https://gitlab.freedesktop.org/drm/intel/issues/2505>) o fi-ivb-3770: NOTRUN -> FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20502/fi-ivb-3770/igt@[email protected]> (fdo#109271 <https://bugs.freedesktop.org/show_bug.cgi?id=109271>) Possible fixes*
igt@i915_module_load@reload: o fi-kbl-soraka: DMESG-WARN <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10296/fi-kbl-soraka/igt@[email protected]> (i915#1982 <https://gitlab.freedesktop.org/drm/intel/issues/1982>) -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20502/fi-kbl-soraka/igt@[email protected]>*
igt@i915_selftest@live@hangcheck: o fi-snb-2600: INCOMPLETE <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10296/fi-snb-2600/igt@i915_selftest@[email protected]> (i915#2782 <https://gitlab.freedesktop.org/drm/intel/issues/2782>) -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20502/fi-snb-2600/igt@i915_selftest@[email protected]>*
igt@kms_flip@basic-flip-vs-wf_vblank@a-dsi1: o {fi-tgl-dsi}: DMESG-WARN <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10296/fi-tgl-dsi/igt@kms_flip@[email protected]> (i915#1982 <https://gitlab.freedesktop.org/drm/intel/issues/1982>) -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20502/fi-tgl-dsi/igt@kms_flip@[email protected]>{name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE).
Participating hosts (37 -> 35)Missing (2): fi-bsw-cyan fi-bdw-samus
Build changes
* Linux:
CI_DRM_10296->Patchwork_20502CI-20190529: 20190529
CI_DRM_10296:1ad092a7879a55938159b58a5b662370cab95ec8@git://anongit.freedesktop.org/gfx-ci/linuxIGT_6125:5bb62cb290fa32777934de4b39e107ccd282f7e8@ https://gitlab.freedesktop.org/drm/igt-gpu-tools.gitPatchwork_20502:21c6e6f45c89cd7f4f38e9a6ef4992b6a5204031@git://anongit.freedesktop.org/gfx-ci/linux== Linux commits ==
21c6e6f45c89drm/i915: Drop all references to DRM IRQ midlayer1b2c2d630094drm/i915: Use the correct IRQ during resume
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 15 lines · Thomas Zimmermann
Fix a bug in the usage of IRQs and cleanup references to the DRM IRQ midlayer.
Preferably this patchset would be merged through drm-misc-next.
v4:
* switch IRQ code tointel_synchronize_irq()(Daniel)
v3:
* also useintel_synchronize_hardirq()from other callsite
v2:
* split patch
* also fix comment
* addintel_synchronize_hardirq()(Ville)
* update Fixes tag (Daniel)
Quoted 3 lines
Thomas Zimmermann (2):
drm/i915: Use the correct IRQ during resume drm/i915: Drop all references to DRM IRQ midlayer
Both pushed to drm-intel-gt-next, thanks for your patches. -Daniel
Quoted 12 lines
drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- drivers/gpu/drm/i915/gt/intel_ring_submission.c | 2 +- drivers/gpu/drm/i915/i915_drv.c | 1 - drivers/gpu/drm/i915/i915_irq.c | 5 ----- 4 files changed, 2 insertions(+), 8 deletions(-)base-commit:
67f5a18128770817e4218a9e496d2bf5047c51e8--
2.32.0
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx