* [PATCH] drm/i915: Favor last VBT child device with conflicting AUX ch/DDC pin
@ 2019-10-11 20:20 Ville Syrjala
2019-10-11 22:21 ` ✓ Fi.CI.BAT: success for " Patchwork
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Ville Syrjala @ 2019-10-11 20:20 UTC (permalink / raw)
To: intel-gfx; +Cc: stable, Jani Nikula, Masami Ichikawa, Torsten
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
The first come first served apporoach to handling the VBT
child device AUX ch conflicts has backfired. We have machines
in the wild where the VBT specifies both port A eDP and
port E DP (in that order) with port E being the real one.
So let's try to flip the preference around and let the last
child device win once again.
Cc: stable@vger.kernel.org
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Masami Ichikawa <masami256@gmail.com>
Tested-by: Torsten <freedesktop201910@liggy.de>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111966
Fixes: 36a0f92020dc ("drm/i915/bios: make child device order the priority order")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_bios.c | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 9628b485b179..f0307b04cc13 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -1270,7 +1270,7 @@ static void sanitize_ddc_pin(struct drm_i915_private *dev_priv,
DRM_DEBUG_KMS("port %c trying to use the same DDC pin (0x%x) as port %c, "
"disabling port %c DVI/HDMI support\n",
port_name(port), info->alternate_ddc_pin,
- port_name(p), port_name(port));
+ port_name(p), port_name(p));
/*
* If we have multiple ports supposedly sharing the
@@ -1278,9 +1278,14 @@ static void sanitize_ddc_pin(struct drm_i915_private *dev_priv,
* port. Otherwise they share the same ddc bin and
* system couldn't communicate with them separately.
*
- * Give child device order the priority, first come first
- * served.
+ * Give inverse child device order the priority,
+ * last one wins. Yes, there are real machines
+ * (eg. Asrock B250M-HDV) where VBT has both
+ * port A and port E with the same AUX ch and
+ * we must pick port E :(
*/
+ info = &dev_priv->vbt.ddi_port_info[p];
+
info->supports_dvi = false;
info->supports_hdmi = false;
info->alternate_ddc_pin = 0;
@@ -1316,7 +1321,7 @@ static void sanitize_aux_ch(struct drm_i915_private *dev_priv,
DRM_DEBUG_KMS("port %c trying to use the same AUX CH (0x%x) as port %c, "
"disabling port %c DP support\n",
port_name(port), info->alternate_aux_channel,
- port_name(p), port_name(port));
+ port_name(p), port_name(p));
/*
* If we have multiple ports supposedlt sharing the
@@ -1324,9 +1329,14 @@ static void sanitize_aux_ch(struct drm_i915_private *dev_priv,
* port. Otherwise they share the same aux channel
* and system couldn't communicate with them separately.
*
- * Give child device order the priority, first come first
- * served.
+ * Give inverse child device order the priority,
+ * last one wins. Yes, there are real machines
+ * (eg. Asrock B250M-HDV) where VBT has both
+ * port A and port E with the same AUX ch and
+ * we must pick port E :(
*/
+ info = &dev_priv->vbt.ddi_port_info[p];
+
info->supports_dp = false;
info->alternate_aux_channel = 0;
}
--
2.21.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Favor last VBT child device with conflicting AUX ch/DDC pin
2019-10-11 20:20 [PATCH] drm/i915: Favor last VBT child device with conflicting AUX ch/DDC pin Ville Syrjala
@ 2019-10-11 22:21 ` Patchwork
2019-10-12 9:24 ` ✗ Fi.CI.IGT: failure " Patchwork
2019-10-14 8:16 ` Jani Nikula
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2019-10-11 22:21 UTC (permalink / raw)
To: Ville Syrjala; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Favor last VBT child device with conflicting AUX ch/DDC pin
URL : https://patchwork.freedesktop.org/series/67931/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7067 -> Patchwork_14775
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/index.html
Known issues
------------
Here are the changes found in Patchwork_14775 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_reloc@basic-write-gtt-noreloc:
- fi-icl-u3: [PASS][1] -> [DMESG-WARN][2] ([fdo#107724]) +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/fi-icl-u3/igt@gem_exec_reloc@basic-write-gtt-noreloc.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/fi-icl-u3/igt@gem_exec_reloc@basic-write-gtt-noreloc.html
* igt@i915_selftest@live_hangcheck:
- fi-icl-u3: [PASS][3] -> [DMESG-FAIL][4] ([fdo#111678])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/fi-icl-u3/igt@i915_selftest@live_hangcheck.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/fi-icl-u3/igt@i915_selftest@live_hangcheck.html
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [PASS][5] -> [FAIL][6] ([fdo#111407])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s4-devices:
- fi-blb-e6850: [INCOMPLETE][7] ([fdo#107718]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/fi-blb-e6850/igt@gem_exec_suspend@basic-s4-devices.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/fi-blb-e6850/igt@gem_exec_suspend@basic-s4-devices.html
* igt@prime_busy@basic-before-default:
- fi-icl-u3: [DMESG-WARN][9] ([fdo#107724]) -> [PASS][10] +2 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/fi-icl-u3/igt@prime_busy@basic-before-default.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/fi-icl-u3/igt@prime_busy@basic-before-default.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#110566]: https://bugs.freedesktop.org/show_bug.cgi?id=110566
[fdo#111407]: https://bugs.freedesktop.org/show_bug.cgi?id=111407
[fdo#111600]: https://bugs.freedesktop.org/show_bug.cgi?id=111600
[fdo#111678]: https://bugs.freedesktop.org/show_bug.cgi?id=111678
Participating hosts (47 -> 42)
------------------------------
Additional (2): fi-tgl-u fi-pnv-d510
Missing (7): fi-hsw-4200u fi-byt-squawks fi-icl-u2 fi-bsw-cyan fi-icl-y fi-icl-guc fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7067 -> Patchwork_14775
CI-20190529: 20190529
CI_DRM_7067: c35b67c7e343501f0ae7cf4517c9486ae05ac72f @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5221: 280734ceacde4ff52c6bd5a9e3d664f77f76b85d @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14775: 96eb2c4bc298ead96d7d61aa6a674943d49de4a6 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
96eb2c4bc298 drm/i915: Favor last VBT child device with conflicting AUX ch/DDC pin
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* ✗ Fi.CI.IGT: failure for drm/i915: Favor last VBT child device with conflicting AUX ch/DDC pin
2019-10-11 20:20 [PATCH] drm/i915: Favor last VBT child device with conflicting AUX ch/DDC pin Ville Syrjala
2019-10-11 22:21 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2019-10-12 9:24 ` Patchwork
2019-10-14 8:16 ` Jani Nikula
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2019-10-12 9:24 UTC (permalink / raw)
To: Ville Syrjala; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Favor last VBT child device with conflicting AUX ch/DDC pin
URL : https://patchwork.freedesktop.org/series/67931/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_7067_full -> Patchwork_14775_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_14775_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_14775_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_14775_full:
### IGT changes ###
#### Possible regressions ####
* igt@kms_rotation_crc@bad-tiling:
- shard-skl: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-skl4/igt@kms_rotation_crc@bad-tiling.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-skl4/igt@kms_rotation_crc@bad-tiling.html
Known issues
------------
Here are the changes found in Patchwork_14775_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_shared@exec-single-timeline-bsd:
- shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#110841])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-iclb3/igt@gem_ctx_shared@exec-single-timeline-bsd.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-iclb1/igt@gem_ctx_shared@exec-single-timeline-bsd.html
* igt@gem_exec_schedule@independent-bsd2:
- shard-iclb: [PASS][5] -> [SKIP][6] ([fdo#109276]) +27 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-iclb1/igt@gem_exec_schedule@independent-bsd2.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-iclb5/igt@gem_exec_schedule@independent-bsd2.html
* igt@gem_exec_schedule@preempt-other-chain-bsd:
- shard-iclb: [PASS][7] -> [SKIP][8] ([fdo#111325]) +4 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-iclb8/igt@gem_exec_schedule@preempt-other-chain-bsd.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-iclb2/igt@gem_exec_schedule@preempt-other-chain-bsd.html
* igt@gem_tiled_swapping@non-threaded:
- shard-glk: [PASS][9] -> [INCOMPLETE][10] ([fdo#103359] / [fdo#108686] / [k.org#198133])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-glk2/igt@gem_tiled_swapping@non-threaded.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-glk1/igt@gem_tiled_swapping@non-threaded.html
- shard-kbl: [PASS][11] -> [INCOMPLETE][12] ([fdo#103665] / [fdo#108686])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-kbl6/igt@gem_tiled_swapping@non-threaded.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-kbl6/igt@gem_tiled_swapping@non-threaded.html
* igt@gem_userptr_blits@sync-unmap-after-close:
- shard-snb: [PASS][13] -> [DMESG-WARN][14] ([fdo#111870])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-snb2/igt@gem_userptr_blits@sync-unmap-after-close.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-snb2/igt@gem_userptr_blits@sync-unmap-after-close.html
* igt@gem_userptr_blits@sync-unmap-cycles:
- shard-hsw: [PASS][15] -> [DMESG-WARN][16] ([fdo#111870]) +1 similar issue
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-hsw7/igt@gem_userptr_blits@sync-unmap-cycles.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-hsw4/igt@gem_userptr_blits@sync-unmap-cycles.html
* igt@gem_workarounds@suspend-resume-context:
- shard-apl: [PASS][17] -> [DMESG-WARN][18] ([fdo#108566]) +3 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-apl6/igt@gem_workarounds@suspend-resume-context.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-apl7/igt@gem_workarounds@suspend-resume-context.html
* igt@i915_suspend@sysfs-reader:
- shard-iclb: [PASS][19] -> [INCOMPLETE][20] ([fdo#107713])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-iclb2/igt@i915_suspend@sysfs-reader.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-iclb7/igt@i915_suspend@sysfs-reader.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-skl: [PASS][21] -> [FAIL][22] ([fdo#105363])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-skl8/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-skl2/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render:
- shard-iclb: [PASS][23] -> [FAIL][24] ([fdo#103167]) +4 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-iclb5/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-iclb5/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render.html
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-shrfb-draw-mmap-wc:
- shard-skl: [PASS][25] -> [FAIL][26] ([fdo#103167])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-skl10/igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-shrfb-draw-mmap-wc.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-skl5/igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-shrfb-draw-mmap-wc.html
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [PASS][27] -> [FAIL][28] ([fdo#108145])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-skl10/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-skl5/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [PASS][29] -> [SKIP][30] ([fdo#109441]) +1 similar issue
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-iclb7/igt@kms_psr@psr2_sprite_plane_move.html
* igt@kms_setmode@basic:
- shard-apl: [PASS][31] -> [FAIL][32] ([fdo#99912])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-apl1/igt@kms_setmode@basic.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-apl3/igt@kms_setmode@basic.html
* igt@perf@blocking:
- shard-skl: [PASS][33] -> [FAIL][34] ([fdo#110728])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-skl1/igt@perf@blocking.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-skl7/igt@perf@blocking.html
* igt@prime_busy@hang-default:
- shard-apl: [PASS][35] -> [INCOMPLETE][36] ([fdo#103927])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-apl6/igt@prime_busy@hang-default.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-apl3/igt@prime_busy@hang-default.html
#### Possible fixes ####
* igt@gem_eio@unwedge-stress:
- shard-snb: [FAIL][37] ([fdo#109661]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-snb7/igt@gem_eio@unwedge-stress.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-snb4/igt@gem_eio@unwedge-stress.html
* igt@gem_exec_schedule@reorder-wide-bsd:
- shard-iclb: [SKIP][39] ([fdo#111325]) -> [PASS][40] +5 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-iclb4/igt@gem_exec_schedule@reorder-wide-bsd.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-iclb6/igt@gem_exec_schedule@reorder-wide-bsd.html
* igt@gem_userptr_blits@dmabuf-unsync:
- shard-snb: [DMESG-WARN][41] ([fdo#111870]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-snb7/igt@gem_userptr_blits@dmabuf-unsync.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-snb1/igt@gem_userptr_blits@dmabuf-unsync.html
* igt@gem_userptr_blits@sync-unmap-after-close:
- shard-hsw: [DMESG-WARN][43] ([fdo#111870]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-hsw5/igt@gem_userptr_blits@sync-unmap-after-close.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-hsw7/igt@gem_userptr_blits@sync-unmap-after-close.html
* igt@kms_cursor_crc@pipe-b-cursor-64x21-onscreen:
- shard-apl: [INCOMPLETE][45] ([fdo#103927]) -> [PASS][46] +3 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-apl8/igt@kms_cursor_crc@pipe-b-cursor-64x21-onscreen.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-apl1/igt@kms_cursor_crc@pipe-b-cursor-64x21-onscreen.html
* igt@kms_cursor_legacy@flip-vs-cursor-toggle:
- shard-skl: [FAIL][47] ([fdo#102670] / [fdo#106081]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-skl4/igt@kms_cursor_legacy@flip-vs-cursor-toggle.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-skl4/igt@kms_cursor_legacy@flip-vs-cursor-toggle.html
* igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
- shard-glk: [FAIL][49] ([fdo#105363]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-glk5/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-glk4/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-blt:
- shard-iclb: [FAIL][51] ([fdo#103167]) -> [PASS][52] +1 similar issue
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-iclb4/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-blt.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-iclb8/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-blt.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-mmap-gtt:
- {shard-tglb}: [INCOMPLETE][53] -> [PASS][54] +1 similar issue
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-tglb7/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-mmap-gtt.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-tglb5/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-mmap-gtt.html
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-gtt:
- shard-skl: [FAIL][55] ([fdo#103167]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-skl7/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-gtt.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-skl3/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-gtt.html
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
- shard-apl: [DMESG-WARN][57] ([fdo#108566]) -> [PASS][58] +3 similar issues
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-apl7/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-apl1/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-skl: [FAIL][59] ([fdo#108145]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-skl3/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/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][61] ([fdo#108145] / [fdo#110403]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-skl1/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-skl6/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
* igt@kms_psr@psr2_sprite_blt:
- shard-iclb: [SKIP][63] ([fdo#109441]) -> [PASS][64] +1 similar issue
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-iclb8/igt@kms_psr@psr2_sprite_blt.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-iclb2/igt@kms_psr@psr2_sprite_blt.html
* igt@prime_busy@hang-bsd2:
- shard-iclb: [SKIP][65] ([fdo#109276]) -> [PASS][66] +20 similar issues
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-iclb5/igt@prime_busy@hang-bsd2.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-iclb4/igt@prime_busy@hang-bsd2.html
#### Warnings ####
* igt@gem_ctx_isolation@vcs1-nonpriv:
- shard-iclb: [SKIP][67] ([fdo#109276]) -> [FAIL][68] ([fdo#111329])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-iclb3/igt@gem_ctx_isolation@vcs1-nonpriv.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-iclb1/igt@gem_ctx_isolation@vcs1-nonpriv.html
* igt@gem_mocs_settings@mocs-reset-bsd2:
- shard-iclb: [SKIP][69] ([fdo#109276]) -> [FAIL][70] ([fdo#111330])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-iclb6/igt@gem_mocs_settings@mocs-reset-bsd2.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-iclb1/igt@gem_mocs_settings@mocs-reset-bsd2.html
* igt@gem_mocs_settings@mocs-settings-bsd2:
- shard-iclb: [FAIL][71] ([fdo#111330]) -> [SKIP][72] ([fdo#109276]) +1 similar issue
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7067/shard-iclb2/igt@gem_mocs_settings@mocs-settings-bsd2.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14775/shard-iclb6/igt@gem_mocs_settings@mocs-settings-bsd2.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#102670]: https://bugs.freedesktop.org/show_bug.cgi?id=102670
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#106081]: https://bugs.freedesktop.org/show_bug.cgi?id=106081
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109661]: https://bugs.freedesktop.org/show_bug.cgi?id=109661
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
[fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
[fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841
[fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325
[fdo#111329]: https://bugs.freedesktop.org/show_bug.cgi?id=111329
[fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330
[fdo#111832]: https://bugs.freedesktop.org/show_bug.cgi?id=111832
[fdo#111867]: https://bugs.freedesktop.org/show_bug.cgi?id=111867
[fdo#111870]: https://bugs.freedesktop.org/show_bug.cgi?id=111870
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
Participating hosts (11 -> 11)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7067 -> Patchwork_14775
CI-20190529: 20190529
CI_DRM_7067: c35b67c7e343501f0ae7cf4517c9486ae05ac72f @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5221: 280734ceacde4ff52c6bd5a9e3d664f77f76b85d @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14775: 96eb2c4bc298ead96d7d61aa6a674943d49de4a6 @ 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_14775/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: Favor last VBT child device with conflicting AUX ch/DDC pin
2019-10-11 20:20 [PATCH] drm/i915: Favor last VBT child device with conflicting AUX ch/DDC pin Ville Syrjala
@ 2019-10-14 8:16 ` Jani Nikula
2019-10-12 9:24 ` ✗ Fi.CI.IGT: failure " Patchwork
2019-10-14 8:16 ` Jani Nikula
2 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2019-10-14 8:16 UTC (permalink / raw)
To: Ville Syrjala, intel-gfx; +Cc: stable, Masami Ichikawa, Torsten
On Fri, 11 Oct 2019, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> The first come first served apporoach to handling the VBT
> child device AUX ch conflicts has backfired. We have machines
> in the wild where the VBT specifies both port A eDP and
> port E DP (in that order) with port E being the real one.
>
> So let's try to flip the preference around and let the last
> child device win once again.
I think there will be legitimate cases where we need first come first
served. Oh well, another VBT misery to tackle in the future.
Acked-by: Jani Nikula <jani.nikula@intel.com>
>
> Cc: stable@vger.kernel.org
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: Masami Ichikawa <masami256@gmail.com>
> Tested-by: Torsten <freedesktop201910@liggy.de>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111966
> Fixes: 36a0f92020dc ("drm/i915/bios: make child device order the priority order")
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_bios.c | 22 ++++++++++++++++------
> 1 file changed, 16 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
> index 9628b485b179..f0307b04cc13 100644
> --- a/drivers/gpu/drm/i915/display/intel_bios.c
> +++ b/drivers/gpu/drm/i915/display/intel_bios.c
> @@ -1270,7 +1270,7 @@ static void sanitize_ddc_pin(struct drm_i915_private *dev_priv,
> DRM_DEBUG_KMS("port %c trying to use the same DDC pin (0x%x) as port %c, "
> "disabling port %c DVI/HDMI support\n",
> port_name(port), info->alternate_ddc_pin,
> - port_name(p), port_name(port));
> + port_name(p), port_name(p));
>
> /*
> * If we have multiple ports supposedly sharing the
> @@ -1278,9 +1278,14 @@ static void sanitize_ddc_pin(struct drm_i915_private *dev_priv,
> * port. Otherwise they share the same ddc bin and
> * system couldn't communicate with them separately.
> *
> - * Give child device order the priority, first come first
> - * served.
> + * Give inverse child device order the priority,
> + * last one wins. Yes, there are real machines
> + * (eg. Asrock B250M-HDV) where VBT has both
> + * port A and port E with the same AUX ch and
> + * we must pick port E :(
> */
> + info = &dev_priv->vbt.ddi_port_info[p];
> +
> info->supports_dvi = false;
> info->supports_hdmi = false;
> info->alternate_ddc_pin = 0;
> @@ -1316,7 +1321,7 @@ static void sanitize_aux_ch(struct drm_i915_private *dev_priv,
> DRM_DEBUG_KMS("port %c trying to use the same AUX CH (0x%x) as port %c, "
> "disabling port %c DP support\n",
> port_name(port), info->alternate_aux_channel,
> - port_name(p), port_name(port));
> + port_name(p), port_name(p));
>
> /*
> * If we have multiple ports supposedlt sharing the
> @@ -1324,9 +1329,14 @@ static void sanitize_aux_ch(struct drm_i915_private *dev_priv,
> * port. Otherwise they share the same aux channel
> * and system couldn't communicate with them separately.
> *
> - * Give child device order the priority, first come first
> - * served.
> + * Give inverse child device order the priority,
> + * last one wins. Yes, there are real machines
> + * (eg. Asrock B250M-HDV) where VBT has both
> + * port A and port E with the same AUX ch and
> + * we must pick port E :(
> */
> + info = &dev_priv->vbt.ddi_port_info[p];
> +
> info->supports_dp = false;
> info->alternate_aux_channel = 0;
> }
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: Favor last VBT child device with conflicting AUX ch/DDC pin
@ 2019-10-14 8:16 ` Jani Nikula
0 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2019-10-14 8:16 UTC (permalink / raw)
To: Ville Syrjala, intel-gfx; +Cc: Masami Ichikawa, Torsten, stable
On Fri, 11 Oct 2019, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> The first come first served apporoach to handling the VBT
> child device AUX ch conflicts has backfired. We have machines
> in the wild where the VBT specifies both port A eDP and
> port E DP (in that order) with port E being the real one.
>
> So let's try to flip the preference around and let the last
> child device win once again.
I think there will be legitimate cases where we need first come first
served. Oh well, another VBT misery to tackle in the future.
Acked-by: Jani Nikula <jani.nikula@intel.com>
>
> Cc: stable@vger.kernel.org
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: Masami Ichikawa <masami256@gmail.com>
> Tested-by: Torsten <freedesktop201910@liggy.de>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111966
> Fixes: 36a0f92020dc ("drm/i915/bios: make child device order the priority order")
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_bios.c | 22 ++++++++++++++++------
> 1 file changed, 16 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
> index 9628b485b179..f0307b04cc13 100644
> --- a/drivers/gpu/drm/i915/display/intel_bios.c
> +++ b/drivers/gpu/drm/i915/display/intel_bios.c
> @@ -1270,7 +1270,7 @@ static void sanitize_ddc_pin(struct drm_i915_private *dev_priv,
> DRM_DEBUG_KMS("port %c trying to use the same DDC pin (0x%x) as port %c, "
> "disabling port %c DVI/HDMI support\n",
> port_name(port), info->alternate_ddc_pin,
> - port_name(p), port_name(port));
> + port_name(p), port_name(p));
>
> /*
> * If we have multiple ports supposedly sharing the
> @@ -1278,9 +1278,14 @@ static void sanitize_ddc_pin(struct drm_i915_private *dev_priv,
> * port. Otherwise they share the same ddc bin and
> * system couldn't communicate with them separately.
> *
> - * Give child device order the priority, first come first
> - * served.
> + * Give inverse child device order the priority,
> + * last one wins. Yes, there are real machines
> + * (eg. Asrock B250M-HDV) where VBT has both
> + * port A and port E with the same AUX ch and
> + * we must pick port E :(
> */
> + info = &dev_priv->vbt.ddi_port_info[p];
> +
> info->supports_dvi = false;
> info->supports_hdmi = false;
> info->alternate_ddc_pin = 0;
> @@ -1316,7 +1321,7 @@ static void sanitize_aux_ch(struct drm_i915_private *dev_priv,
> DRM_DEBUG_KMS("port %c trying to use the same AUX CH (0x%x) as port %c, "
> "disabling port %c DP support\n",
> port_name(port), info->alternate_aux_channel,
> - port_name(p), port_name(port));
> + port_name(p), port_name(p));
>
> /*
> * If we have multiple ports supposedlt sharing the
> @@ -1324,9 +1329,14 @@ static void sanitize_aux_ch(struct drm_i915_private *dev_priv,
> * port. Otherwise they share the same aux channel
> * and system couldn't communicate with them separately.
> *
> - * Give child device order the priority, first come first
> - * served.
> + * Give inverse child device order the priority,
> + * last one wins. Yes, there are real machines
> + * (eg. Asrock B250M-HDV) where VBT has both
> + * port A and port E with the same AUX ch and
> + * we must pick port E :(
> */
> + info = &dev_priv->vbt.ddi_port_info[p];
> +
> info->supports_dp = false;
> info->alternate_aux_channel = 0;
> }
--
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] 5+ messages in thread
end of thread, other threads:[~2019-10-14 8:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-11 20:20 [PATCH] drm/i915: Favor last VBT child device with conflicting AUX ch/DDC pin Ville Syrjala
2019-10-11 22:21 ` ✓ Fi.CI.BAT: success for " Patchwork
2019-10-12 9:24 ` ✗ Fi.CI.IGT: failure " Patchwork
2019-10-14 8:16 ` [PATCH] " Jani Nikula
2019-10-14 8:16 ` 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.