* [Intel-gfx] [CI] drm/i915: split i915_driver_modeset_probe() to pre/post irq install
@ 2020-02-19 13:37 Jani Nikula
2020-02-19 18:11 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Jani Nikula @ 2020-02-19 13:37 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Pair the irq install and uninstall in the same layer. There are no
functional changes in the happy day scenario. The cleanup paths are
currently a mess though.
Note that modeset probe pre-irq + post-irq install are matched by
modeset driver remove pre-irq + post-irq uninstall, together, but not
independently. They are not symmetric pairs.
v2: don't add a new probe failure point here
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/i915_drv.c | 40 ++++++++++++++++++++++-----------
1 file changed, 27 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 759d333448e1..7aad65644351 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -212,7 +212,8 @@ intel_teardown_mchbar(struct drm_i915_private *dev_priv)
release_resource(&dev_priv->mch_res);
}
-static int i915_driver_modeset_probe(struct drm_i915_private *i915)
+/* part #1: call before irq install */
+static int i915_driver_modeset_probe_noirq(struct drm_i915_private *i915)
{
int ret;
@@ -236,15 +237,22 @@ static int i915_driver_modeset_probe(struct drm_i915_private *i915)
intel_csr_ucode_init(i915);
- ret = intel_irq_install(i915);
- if (ret)
- goto cleanup_csr;
+ return 0;
+
+out:
+ return ret;
+}
+
+/* part #2: call after irq install */
+static int i915_driver_modeset_probe(struct drm_i915_private *i915)
+{
+ int ret;
/* Important: The output setup functions called by modeset_init need
* working irqs for e.g. gmbus and dp aux transfers. */
ret = intel_modeset_init(i915);
if (ret)
- goto cleanup_irq;
+ goto out;
ret = i915_gem_init(i915);
if (ret)
@@ -271,16 +279,10 @@ static int i915_driver_modeset_probe(struct drm_i915_private *i915)
i915_gem_driver_remove(i915);
i915_gem_driver_release(i915);
cleanup_modeset:
+ /* FIXME */
intel_modeset_driver_remove(i915);
intel_irq_uninstall(i915);
intel_modeset_driver_remove_noirq(i915);
- goto cleanup_csr;
-cleanup_irq:
- intel_irq_uninstall(i915);
-cleanup_csr:
- intel_csr_ucode_fini(i915);
- intel_power_domains_driver_remove(i915);
- intel_vga_unregister(i915);
out:
return ret;
}
@@ -1459,10 +1461,18 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (ret < 0)
goto out_cleanup_mmio;
- ret = i915_driver_modeset_probe(i915);
+ ret = i915_driver_modeset_probe_noirq(i915);
if (ret < 0)
goto out_cleanup_hw;
+ ret = intel_irq_install(i915);
+ if (ret)
+ goto out_cleanup_modeset;
+
+ ret = i915_driver_modeset_probe(i915);
+ if (ret < 0)
+ goto out_cleanup_irq;
+
i915_driver_register(i915);
enable_rpm_wakeref_asserts(&i915->runtime_pm);
@@ -1471,6 +1481,10 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
return 0;
+out_cleanup_irq:
+ intel_irq_uninstall(i915);
+out_cleanup_modeset:
+ /* FIXME */
out_cleanup_hw:
i915_driver_hw_remove(i915);
intel_memory_regions_driver_release(i915);
--
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] 4+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: split i915_driver_modeset_probe() to pre/post irq install
2020-02-19 13:37 [Intel-gfx] [CI] drm/i915: split i915_driver_modeset_probe() to pre/post irq install Jani Nikula
@ 2020-02-19 18:11 ` Patchwork
2020-02-21 14:28 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2020-02-23 15:24 ` [Intel-gfx] [CI] " Jani Nikula
2 siblings, 0 replies; 4+ messages in thread
From: Patchwork @ 2020-02-19 18:11 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: split i915_driver_modeset_probe() to pre/post irq install
URL : https://patchwork.freedesktop.org/series/73649/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7966 -> Patchwork_16624
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/index.html
Known issues
------------
Here are the changes found in Patchwork_16624 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live_gtt:
- fi-kbl-7500u: [PASS][1] -> [TIMEOUT][2] ([fdo#112271])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/fi-kbl-7500u/igt@i915_selftest@live_gtt.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/fi-kbl-7500u/igt@i915_selftest@live_gtt.html
#### Possible fixes ####
* igt@i915_selftest@live_gem_contexts:
- fi-cml-s: [DMESG-FAIL][3] ([i915#877]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/fi-cml-s/igt@i915_selftest@live_gem_contexts.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/fi-cml-s/igt@i915_selftest@live_gem_contexts.html
* igt@i915_selftest@live_gtt:
- fi-glk-dsi: [TIMEOUT][5] ([fdo#112271] / [i915#690]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/fi-glk-dsi/igt@i915_selftest@live_gtt.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/fi-glk-dsi/igt@i915_selftest@live_gtt.html
* igt@i915_selftest@live_sanitycheck:
- fi-icl-u3: [DMESG-WARN][7] ([i915#585]) -> [PASS][8] +1 similar issue
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/fi-icl-u3/igt@i915_selftest@live_sanitycheck.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/fi-icl-u3/igt@i915_selftest@live_sanitycheck.html
[fdo#112271]: https://bugs.freedesktop.org/show_bug.cgi?id=112271
[i915#585]: https://gitlab.freedesktop.org/drm/intel/issues/585
[i915#690]: https://gitlab.freedesktop.org/drm/intel/issues/690
[i915#877]: https://gitlab.freedesktop.org/drm/intel/issues/877
Participating hosts (49 -> 35)
------------------------------
Additional (1): fi-snb-2600
Missing (15): fi-ilk-m540 fi-bdw-5557u fi-tgl-dsi fi-bsw-n3050 fi-hsw-4200u fi-skl-guc fi-byt-squawks fi-bsw-cyan fi-bwr-2160 fi-ctg-p8600 fi-ivb-3770 fi-blb-e6850 fi-byt-clapper fi-bsw-nick fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7966 -> Patchwork_16624
CI-20190529: 20190529
CI_DRM_7966: 014bfb094e0b4e80d7510dc5d6f45e5e73bbb419 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5451: 1c42f971d37a066da3e588783611ab08d5afbded @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16624: c6fcb662e9c3133e0be1997b152336e08f5c349b @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
c6fcb662e9c3 drm/i915: split i915_driver_modeset_probe() to pre/post irq install
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915: split i915_driver_modeset_probe() to pre/post irq install
2020-02-19 13:37 [Intel-gfx] [CI] drm/i915: split i915_driver_modeset_probe() to pre/post irq install Jani Nikula
2020-02-19 18:11 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
@ 2020-02-21 14:28 ` Patchwork
2020-02-23 15:24 ` [Intel-gfx] [CI] " Jani Nikula
2 siblings, 0 replies; 4+ messages in thread
From: Patchwork @ 2020-02-21 14:28 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: split i915_driver_modeset_probe() to pre/post irq install
URL : https://patchwork.freedesktop.org/series/73649/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7966_full -> Patchwork_16624_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_16624_full:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* {igt@gem_ctx_persistence@close-replace-race}:
- shard-skl: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-skl9/igt@gem_ctx_persistence@close-replace-race.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-skl10/igt@gem_ctx_persistence@close-replace-race.html
New tests
---------
New tests have been introduced between CI_DRM_7966_full and Patchwork_16624_full:
### New IGT tests (2) ###
* igt@gem_eio@context-create:
- Statuses : 8 pass(s)
- Exec time: [0.02, 0.14] s
* igt@kms_mmap_write_crc@main:
- Statuses : 7 pass(s)
- Exec time: [3.79, 21.76] s
Known issues
------------
Here are the changes found in Patchwork_16624_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_create@create-clear:
- shard-hsw: [PASS][3] -> [TIMEOUT][4] ([fdo#112271])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-hsw2/igt@gem_create@create-clear.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-hsw5/igt@gem_create@create-clear.html
* igt@gem_ctx_isolation@bcs0-s3:
- shard-kbl: [PASS][5] -> [INCOMPLETE][6] ([fdo#103665])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-kbl7/igt@gem_ctx_isolation@bcs0-s3.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-kbl6/igt@gem_ctx_isolation@bcs0-s3.html
* igt@gem_ctx_shared@exec-single-timeline-bsd:
- shard-iclb: [PASS][7] -> [SKIP][8] ([fdo#110841])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-iclb6/igt@gem_ctx_shared@exec-single-timeline-bsd.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-iclb1/igt@gem_ctx_shared@exec-single-timeline-bsd.html
* igt@gem_eio@in-flight-suspend:
- shard-kbl: [PASS][9] -> [DMESG-WARN][10] ([i915#180]) +3 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-kbl2/igt@gem_eio@in-flight-suspend.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-kbl4/igt@gem_eio@in-flight-suspend.html
* igt@gem_exec_balancer@hang:
- shard-tglb: [PASS][11] -> [FAIL][12] ([i915#1277])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-tglb6/igt@gem_exec_balancer@hang.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-tglb7/igt@gem_exec_balancer@hang.html
* igt@gem_exec_schedule@pi-distinct-iova-bsd:
- shard-iclb: [PASS][13] -> [SKIP][14] ([i915#677]) +1 similar issue
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-iclb6/igt@gem_exec_schedule@pi-distinct-iova-bsd.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-iclb1/igt@gem_exec_schedule@pi-distinct-iova-bsd.html
* igt@gem_exec_schedule@preemptive-hang-bsd:
- shard-iclb: [PASS][15] -> [SKIP][16] ([fdo#112146]) +8 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-iclb7/igt@gem_exec_schedule@preemptive-hang-bsd.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-iclb2/igt@gem_exec_schedule@preemptive-hang-bsd.html
* igt@gem_ppgtt@flink-and-close-vma-leak:
- shard-glk: [PASS][17] -> [FAIL][18] ([i915#644])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-glk8/igt@gem_ppgtt@flink-and-close-vma-leak.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-glk3/igt@gem_ppgtt@flink-and-close-vma-leak.html
* igt@gem_tiled_blits@interruptible:
- shard-hsw: [PASS][19] -> [FAIL][20] ([i915#818])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-hsw6/igt@gem_tiled_blits@interruptible.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-hsw1/igt@gem_tiled_blits@interruptible.html
* igt@i915_module_load@reload-with-fault-injection:
- shard-kbl: [PASS][21] -> [INCOMPLETE][22] ([fdo#103665] / [i915#879])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-kbl7/igt@i915_module_load@reload-with-fault-injection.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-kbl1/igt@i915_module_load@reload-with-fault-injection.html
- shard-apl: [PASS][23] -> [INCOMPLETE][24] ([fdo#103927])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-apl4/igt@i915_module_load@reload-with-fault-injection.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-apl6/igt@i915_module_load@reload-with-fault-injection.html
* igt@i915_pm_rpm@universal-planes-dpms:
- shard-tglb: [PASS][25] -> [TIMEOUT][26] ([fdo#112126] / [fdo#112271]) +3 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-tglb1/igt@i915_pm_rpm@universal-planes-dpms.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-tglb8/igt@i915_pm_rpm@universal-planes-dpms.html
* igt@i915_suspend@fence-restore-untiled:
- shard-apl: [PASS][27] -> [DMESG-WARN][28] ([i915#180])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-apl8/igt@i915_suspend@fence-restore-untiled.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-apl6/igt@i915_suspend@fence-restore-untiled.html
* igt@kms_flip@flip-vs-panning-vs-hang-interruptible:
- shard-tglb: [PASS][29] -> [TIMEOUT][30] ([fdo#112271] / [i915#561]) +3 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-tglb6/igt@kms_flip@flip-vs-panning-vs-hang-interruptible.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-tglb2/igt@kms_flip@flip-vs-panning-vs-hang-interruptible.html
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [PASS][31] -> [FAIL][32] ([fdo#108145])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-skl9/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-skl1/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
* igt@kms_psr@psr2_sprite_mmap_gtt:
- shard-iclb: [PASS][33] -> [SKIP][34] ([fdo#109441]) +1 similar issue
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_gtt.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-iclb5/igt@kms_psr@psr2_sprite_mmap_gtt.html
* igt@kms_vblank@crtc-id:
- shard-snb: [PASS][35] -> [SKIP][36] ([fdo#109271]) +2 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-snb1/igt@kms_vblank@crtc-id.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-snb4/igt@kms_vblank@crtc-id.html
* igt@kms_vblank@pipe-b-ts-continuation-dpms-rpm:
- shard-iclb: [PASS][37] -> [SKIP][38] ([fdo#109278])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-iclb6/igt@kms_vblank@pipe-b-ts-continuation-dpms-rpm.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-iclb3/igt@kms_vblank@pipe-b-ts-continuation-dpms-rpm.html
- shard-hsw: [PASS][39] -> [SKIP][40] ([fdo#109271])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-hsw8/igt@kms_vblank@pipe-b-ts-continuation-dpms-rpm.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-hsw7/igt@kms_vblank@pipe-b-ts-continuation-dpms-rpm.html
- shard-tglb: [PASS][41] -> [SKIP][42] ([fdo#112015])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-tglb8/igt@kms_vblank@pipe-b-ts-continuation-dpms-rpm.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-tglb5/igt@kms_vblank@pipe-b-ts-continuation-dpms-rpm.html
- shard-skl: [PASS][43] -> [SKIP][44] ([fdo#109271])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-skl9/igt@kms_vblank@pipe-b-ts-continuation-dpms-rpm.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-skl9/igt@kms_vblank@pipe-b-ts-continuation-dpms-rpm.html
- shard-glk: [PASS][45] -> [SKIP][46] ([fdo#109271])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-glk4/igt@kms_vblank@pipe-b-ts-continuation-dpms-rpm.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-glk4/igt@kms_vblank@pipe-b-ts-continuation-dpms-rpm.html
* igt@kms_vblank@pipe-c-ts-continuation-suspend:
- shard-skl: [PASS][47] -> [INCOMPLETE][48] ([i915#69])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-skl1/igt@kms_vblank@pipe-c-ts-continuation-suspend.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-skl8/igt@kms_vblank@pipe-c-ts-continuation-suspend.html
* igt@perf_pmu@busy-vcs1:
- shard-iclb: [PASS][49] -> [SKIP][50] ([fdo#112080]) +11 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-iclb4/igt@perf_pmu@busy-vcs1.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-iclb5/igt@perf_pmu@busy-vcs1.html
* igt@prime_vgem@fence-wait-bsd2:
- shard-iclb: [PASS][51] -> [SKIP][52] ([fdo#109276]) +16 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-iclb4/igt@prime_vgem@fence-wait-bsd2.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-iclb5/igt@prime_vgem@fence-wait-bsd2.html
#### Possible fixes ####
* igt@gem_exec_parallel@vcs1-fds:
- shard-iclb: [SKIP][53] ([fdo#112080]) -> [PASS][54] +16 similar issues
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-iclb7/igt@gem_exec_parallel@vcs1-fds.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-iclb1/igt@gem_exec_parallel@vcs1-fds.html
* {igt@gem_exec_schedule@implicit-read-write-bsd1}:
- shard-iclb: [SKIP][55] ([fdo#109276] / [i915#677]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-iclb8/igt@gem_exec_schedule@implicit-read-write-bsd1.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-iclb4/igt@gem_exec_schedule@implicit-read-write-bsd1.html
* {igt@gem_exec_schedule@implicit-write-read-bsd}:
- shard-iclb: [SKIP][57] ([i915#677]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-iclb4/igt@gem_exec_schedule@implicit-write-read-bsd.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-iclb6/igt@gem_exec_schedule@implicit-write-read-bsd.html
* igt@gem_exec_schedule@in-order-bsd:
- shard-iclb: [SKIP][59] ([fdo#112146]) -> [PASS][60] +8 similar issues
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-iclb1/igt@gem_exec_schedule@in-order-bsd.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-iclb7/igt@gem_exec_schedule@in-order-bsd.html
* {igt@gem_exec_whisper@basic-contexts-forked}:
- shard-apl: [INCOMPLETE][61] ([fdo#103927]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-apl3/igt@gem_exec_whisper@basic-contexts-forked.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-apl2/igt@gem_exec_whisper@basic-contexts-forked.html
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [FAIL][63] ([i915#454]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-iclb4/igt@i915_pm_dc@dc6-psr.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-iclb6/igt@i915_pm_dc@dc6-psr.html
* igt@kms_busy@extended-pageflip-hang-oldfb-render-pipe-a:
- shard-snb: [SKIP][65] ([fdo#109271]) -> [PASS][66] +4 similar issues
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-snb6/igt@kms_busy@extended-pageflip-hang-oldfb-render-pipe-a.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-snb1/igt@kms_busy@extended-pageflip-hang-oldfb-render-pipe-a.html
* igt@kms_cursor_crc@pipe-b-cursor-64x21-random:
- shard-apl: [FAIL][67] ([i915#54]) -> [PASS][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-apl3/igt@kms_cursor_crc@pipe-b-cursor-64x21-random.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-apl3/igt@kms_cursor_crc@pipe-b-cursor-64x21-random.html
* igt@kms_cursor_crc@pipe-b-cursor-suspend:
- shard-skl: [INCOMPLETE][69] ([i915#300]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-skl6/igt@kms_cursor_crc@pipe-b-cursor-suspend.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-skl4/igt@kms_cursor_crc@pipe-b-cursor-suspend.html
* igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-render:
- shard-glk: [FAIL][71] ([i915#49]) -> [PASS][72]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-glk4/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-render.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-glk4/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-render.html
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-shrfb-msflip-blt:
- shard-tglb: [SKIP][73] ([i915#668]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-tglb1/igt@kms_frontbuffer_tracking@psr-1p-primscrn-shrfb-msflip-blt.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-tglb8/igt@kms_frontbuffer_tracking@psr-1p-primscrn-shrfb-msflip-blt.html
* {igt@kms_hdr@bpc-switch-dpms}:
- shard-skl: [FAIL][75] ([i915#1188]) -> [PASS][76]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-skl5/igt@kms_hdr@bpc-switch-dpms.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-skl7/igt@kms_hdr@bpc-switch-dpms.html
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- shard-kbl: [DMESG-WARN][77] ([i915#180]) -> [PASS][78] +5 similar issues
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-kbl7/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-kbl2/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-skl: [FAIL][79] ([fdo#108145]) -> [PASS][80] +1 similar issue
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-skl8/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-skl3/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [FAIL][81] ([fdo#108145] / [i915#265]) -> [PASS][82] +1 similar issue
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-skl1/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-skl6/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [SKIP][83] ([fdo#109441]) -> [PASS][84] +3 similar issues
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-iclb7/igt@kms_psr@psr2_cursor_render.html
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
* igt@kms_setmode@basic:
- shard-skl: [FAIL][85] ([i915#31]) -> [PASS][86]
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-skl9/igt@kms_setmode@basic.html
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-skl10/igt@kms_setmode@basic.html
* igt@kms_vblank@pipe-c-ts-continuation-suspend:
- shard-apl: [DMESG-WARN][87] ([i915#180]) -> [PASS][88]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-apl6/igt@kms_vblank@pipe-c-ts-continuation-suspend.html
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-apl7/igt@kms_vblank@pipe-c-ts-continuation-suspend.html
* igt@prime_busy@hang-bsd2:
- shard-iclb: [SKIP][89] ([fdo#109276]) -> [PASS][90] +18 similar issues
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-iclb7/igt@prime_busy@hang-bsd2.html
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-iclb2/igt@prime_busy@hang-bsd2.html
* igt@prime_mmap_coherency@ioctl-errors:
- shard-hsw: [FAIL][91] ([i915#831]) -> [PASS][92]
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-hsw1/igt@prime_mmap_coherency@ioctl-errors.html
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-hsw2/igt@prime_mmap_coherency@ioctl-errors.html
#### Warnings ####
* igt@gem_ctx_isolation@vcs1-nonpriv:
- shard-iclb: [SKIP][93] ([fdo#112080]) -> [FAIL][94] ([IGT#28])
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-iclb7/igt@gem_ctx_isolation@vcs1-nonpriv.html
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-iclb2/igt@gem_ctx_isolation@vcs1-nonpriv.html
* igt@i915_pm_dc@dc6-dpms:
- shard-tglb: [SKIP][95] ([i915#468]) -> [FAIL][96] ([i915#454])
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-tglb2/igt@i915_pm_dc@dc6-dpms.html
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-tglb3/igt@i915_pm_dc@dc6-dpms.html
* igt@i915_pm_rpm@gem-idle:
- shard-snb: [INCOMPLETE][97] ([i915#82]) -> [SKIP][98] ([fdo#109271])
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7966/shard-snb6/igt@i915_pm_rpm@gem-idle.html
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16624/shard-snb4/igt@i915_pm_rpm@gem-idle.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[IGT#28]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/28
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[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#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841
[fdo#112015]: https://bugs.freedesktop.org/show_bug.cgi?id=112015
[fdo#112080]: https://bugs.freedesktop.org/show_bug.cgi?id=112080
[fdo#112126]: https://bugs.freedesktop.org/show_bug.cgi?id=112126
[fdo#112146]: https://bugs.freedesktop.org/show_bug.cgi?id=112146
[fdo#112271]: https://bugs.freedesktop.org/show_bug.cgi?id=112271
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1277]: https://gitlab.freedesktop.org/drm/intel/issues/1277
[i915#1291]: https://gitlab.freedesktop.org/drm/intel/issues/1291
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#300]: https://gitlab.freedesktop.org/drm/intel/issues/300
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#468]: https://gitlab.freedesktop.org/drm/intel/issues/468
[i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#561]: https://gitlab.freedesktop.org/drm/intel/issues/561
[i915#644]: https://gitlab.freedesktop.org/drm/intel/issues/644
[i915#668]: https://gitlab.freedesktop.org/drm/intel/issues/668
[i915#677]: https://gitlab.freedesktop.org/drm/intel/issues/677
[i915#69]: https://gitlab.freedesktop.org/drm/intel/issues/69
[i915#750]: https://gitlab.freedesktop.org/drm/intel/issues/750
[i915#818]: https://gitlab.freedesktop.org/drm/intel/issues/818
[i915#82]: https://gitlab.freedesktop.org/drm/intel/issues/82
[i915#831]: https://gitlab.freedesktop.org/drm/intel/issues/831
[i915#879]: https://gitlab.freedesktop.org/drm/intel/issues/879
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7966 -> Patchwork_16624
CI-20190529: 20190529
CI_DRM_7966: 014bfb094e0b4e80d7510dc5d6f45e5e73bbb419 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5451: 1c42f971d37a066da3e588783611ab08d5afbded @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16624: c6fcb662e9c3133e0be1997b152336e08f5c349b @ 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_16624/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Intel-gfx] [CI] drm/i915: split i915_driver_modeset_probe() to pre/post irq install
2020-02-19 13:37 [Intel-gfx] [CI] drm/i915: split i915_driver_modeset_probe() to pre/post irq install Jani Nikula
2020-02-19 18:11 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2020-02-21 14:28 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
@ 2020-02-23 15:24 ` Jani Nikula
2 siblings, 0 replies; 4+ messages in thread
From: Jani Nikula @ 2020-02-23 15:24 UTC (permalink / raw)
To: intel-gfx
On Wed, 19 Feb 2020, Jani Nikula <jani.nikula@intel.com> wrote:
> Pair the irq install and uninstall in the same layer. There are no
> functional changes in the happy day scenario. The cleanup paths are
> currently a mess though.
>
> Note that modeset probe pre-irq + post-irq install are matched by
> modeset driver remove pre-irq + post-irq uninstall, together, but not
> independently. They are not symmetric pairs.
>
> v2: don't add a new probe failure point here
>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Pushed, thanks for the review.
BR,
Jani.
> ---
> drivers/gpu/drm/i915/i915_drv.c | 40 ++++++++++++++++++++++-----------
> 1 file changed, 27 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 759d333448e1..7aad65644351 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -212,7 +212,8 @@ intel_teardown_mchbar(struct drm_i915_private *dev_priv)
> release_resource(&dev_priv->mch_res);
> }
>
> -static int i915_driver_modeset_probe(struct drm_i915_private *i915)
> +/* part #1: call before irq install */
> +static int i915_driver_modeset_probe_noirq(struct drm_i915_private *i915)
> {
> int ret;
>
> @@ -236,15 +237,22 @@ static int i915_driver_modeset_probe(struct drm_i915_private *i915)
>
> intel_csr_ucode_init(i915);
>
> - ret = intel_irq_install(i915);
> - if (ret)
> - goto cleanup_csr;
> + return 0;
> +
> +out:
> + return ret;
> +}
> +
> +/* part #2: call after irq install */
> +static int i915_driver_modeset_probe(struct drm_i915_private *i915)
> +{
> + int ret;
>
> /* Important: The output setup functions called by modeset_init need
> * working irqs for e.g. gmbus and dp aux transfers. */
> ret = intel_modeset_init(i915);
> if (ret)
> - goto cleanup_irq;
> + goto out;
>
> ret = i915_gem_init(i915);
> if (ret)
> @@ -271,16 +279,10 @@ static int i915_driver_modeset_probe(struct drm_i915_private *i915)
> i915_gem_driver_remove(i915);
> i915_gem_driver_release(i915);
> cleanup_modeset:
> + /* FIXME */
> intel_modeset_driver_remove(i915);
> intel_irq_uninstall(i915);
> intel_modeset_driver_remove_noirq(i915);
> - goto cleanup_csr;
> -cleanup_irq:
> - intel_irq_uninstall(i915);
> -cleanup_csr:
> - intel_csr_ucode_fini(i915);
> - intel_power_domains_driver_remove(i915);
> - intel_vga_unregister(i915);
> out:
> return ret;
> }
> @@ -1459,10 +1461,18 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> if (ret < 0)
> goto out_cleanup_mmio;
>
> - ret = i915_driver_modeset_probe(i915);
> + ret = i915_driver_modeset_probe_noirq(i915);
> if (ret < 0)
> goto out_cleanup_hw;
>
> + ret = intel_irq_install(i915);
> + if (ret)
> + goto out_cleanup_modeset;
> +
> + ret = i915_driver_modeset_probe(i915);
> + if (ret < 0)
> + goto out_cleanup_irq;
> +
> i915_driver_register(i915);
>
> enable_rpm_wakeref_asserts(&i915->runtime_pm);
> @@ -1471,6 +1481,10 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>
> return 0;
>
> +out_cleanup_irq:
> + intel_irq_uninstall(i915);
> +out_cleanup_modeset:
> + /* FIXME */
> out_cleanup_hw:
> i915_driver_hw_remove(i915);
> intel_memory_regions_driver_release(i915);
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-02-23 15:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-19 13:37 [Intel-gfx] [CI] drm/i915: split i915_driver_modeset_probe() to pre/post irq install Jani Nikula
2020-02-19 18:11 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2020-02-21 14:28 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2020-02-23 15:24 ` [Intel-gfx] [CI] " Jani Nikula
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.