Skip to contentSkip to conversation

drm/i915/ehl: Port C's hotplug interrupt is associated with TC1 bits

PATCH Applied Vivek Kasireddy 4 participants 5 messages Oct 11, 2019 – Oct 14, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915/ehl: Port C's hotplug interrupt is associated with TC1 bits

On some platforms that have the MCC PCH, Port C's hotplug interrupt bits are mapped to TC1 bits.

---
 drivers/gpu/drm/i915/display/intel_dp.c | 3 +++
 drivers/gpu/drm/i915/i915_irq.c         | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/intel_dp.c +3 -0
index 0e45c61d7331..6594f2af1257 100644
@@ -5282,6 +5282,9 @@ static bool icl_combo_port_connected(struct drm_i915_private *dev_priv,
 {
 	enum port port = intel_dig_port->base.port;
 
+	if (HAS_PCH_MCC(dev_priv) && port == PORT_C)
+		return I915_READ(SDEISR) & SDE_TC_HOTPLUG_ICP(PORT_TC1);
+
 	return I915_READ(SDEISR) & SDE_DDI_HOTPLUG_ICP(port);
 }
 
drivers/gpu/drm/i915/i915_irq.c +4 -4
index 3af7f7914c40..a7c968b01af3 100644
@@ -2249,8 +2249,8 @@ static void icp_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
 		tc_port_hotplug_long_detect = tgp_tc_port_hotplug_long_detect;
 		pins = hpd_tgp;
 	} else if (HAS_PCH_MCC(dev_priv)) {
-		ddi_hotplug_trigger = pch_iir & SDE_DDI_MASK_TGP;
-		tc_hotplug_trigger = 0;
+		ddi_hotplug_trigger = pch_iir & SDE_DDI_MASK_ICP;
+		tc_hotplug_trigger = pch_iir & SDE_TC_HOTPLUG_ICP(PORT_TC1);
 		pins = hpd_icp;
 	} else {
 		ddi_hotplug_trigger = pch_iir & SDE_DDI_MASK_ICP;
@@ -3377,8 +3377,8 @@ static void icp_hpd_irq_setup(struct drm_i915_private *dev_priv,
 static void mcc_hpd_irq_setup(struct drm_i915_private *dev_priv)
 {
 	icp_hpd_irq_setup(dev_priv,
-			  SDE_DDI_MASK_TGP, 0,
-			  TGP_DDI_HPD_ENABLE_MASK, 0,
+			  SDE_DDI_MASK_ICP, SDE_TC_HOTPLUG_ICP(PORT_TC1),
+			  ICP_DDI_HPD_ENABLE_MASK, ICP_TC_HPD_ENABLE(PORT_TC1),
 			  hpd_icp);
 }
 
Signature · 6 lines
2.21.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✓ Fi.CI.BAT: success for drm/i915/ehl: Port C's hotplug interrupt is associated with TC1 bits

== Series Details ==

== Series Details ==

Series: drm/i915/ehl: Port C's hotplug interrupt is associated with TC1 bits
URL : https://patchwork.freedesktop.org/series/67881/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_7060 -> Patchwork_14762
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/index.html

Known issues
------------

Here are the changes found in Patchwork_14762 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_flink_basic@bad-open:
- 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_7060/fi-icl-u3/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/fi-icl-u3/igt@[email protected]

#### Possible fixes ####

* igt@gem_exec_suspend@basic-s3:
- {fi-cml-s}: [DMESG-WARN][3] ([fdo#111764]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/fi-cml-s/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/fi-cml-s/igt@[email protected]

* igt@gem_mmap_gtt@basic:
- fi-icl-u3: [DMESG-WARN][5] ([fdo#107724]) -> [PASS][6] +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/fi-icl-u3/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/fi-icl-u3/igt@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#111764]: https://bugs.freedesktop.org/show_bug.cgi?id=111764

Participating hosts (53 -> 47)
------------------------------

Additional (1): fi-tgl-u2
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus

Build changes
-------------

* CI: CI-20190529 -> None
* Linux: CI_DRM_7060 -> Patchwork_14762

CI-20190529: 20190529
CI_DRM_7060: bac86c35889cffa19d3f7368904c542edde4fafc @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5220: 1e38e32d721210a780198c8293a6b8c8e881df68 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14762: 6b1507605ef813f39c00535fc81257872af2d3a1 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

6b1507605ef8 drm/i915/ehl: Port C's hotplug interrupt is associated with TC1 bits

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw

✓ Fi.CI.IGT: success for drm/i915/ehl: Port C's hotplug interrupt is associated with TC1 bits

In reply to Vivek Kasireddy
== Series Details ==

== Series Details ==

Series: drm/i915/ehl: Port C's hotplug interrupt is associated with TC1 bits
URL : https://patchwork.freedesktop.org/series/67881/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_7060_full -> Patchwork_14762_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_14762_full:

### IGT changes ###

#### Suppressed ####

The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.

* igt@gem_ctx_switch@legacy-bsd2:
- {shard-tglb}: NOTRUN -> [INCOMPLETE][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-tglb8/igt@[email protected]

Known issues
------------

Here are the changes found in Patchwork_14762_full that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_ctx_isolation@rcs0-s3:
- shard-apl: [PASS][2] -> [DMESG-WARN][3] ([fdo#108566]) +1 similar issue
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-apl8/igt@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-apl4/igt@[email protected]

* igt@gem_exec_balancer@smoke:
- shard-iclb: [PASS][4] -> [SKIP][5] ([fdo#110854])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb1/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-iclb3/igt@[email protected]

* igt@gem_exec_schedule@wide-bsd:
- shard-iclb: [PASS][6] -> [SKIP][7] ([fdo#111325]) +4 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb3/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-iclb1/igt@[email protected]

* igt@gem_userptr_blits@sync-unmap-after-close:
- shard-hsw: [PASS][8] -> [DMESG-WARN][9] ([fdo#111870])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-hsw8/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-hsw5/igt@[email protected]

* igt@kms_color@pipe-a-ctm-0-25:
- shard-skl: [PASS][10] -> [DMESG-WARN][11] ([fdo#106107])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-skl5/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-skl1/igt@[email protected]

* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-skl: [PASS][12] -> [FAIL][13] ([fdo#102670] / [fdo#106081])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-skl9/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-skl6/igt@[email protected]

* igt@kms_cursor_legacy@pipe-b-forked-bo:
- shard-hsw: [PASS][14] -> [INCOMPLETE][15] ([fdo#103540])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-hsw8/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-hsw8/igt@[email protected]

* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-skl: [PASS][16] -> [FAIL][17] ([fdo#105363])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-skl1/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-skl10/igt@[email protected]

* igt@kms_flip@flip-vs-suspend:
- shard-snb: [PASS][18] -> [DMESG-WARN][19] ([fdo#102365])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-snb5/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-snb6/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite:
- shard-iclb: [PASS][20] -> [FAIL][21] ([fdo#103167]) +4 similar issues
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb1/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-iclb5/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite.html

* igt@kms_psr@psr2_dpms:
- shard-iclb: [PASS][22] -> [SKIP][23] ([fdo#109441])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb2/igt@kms_psr@psr2_dpms.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-iclb3/igt@kms_psr@psr2_dpms.html

* igt@perf@polling:
- shard-skl: [PASS][24] -> [FAIL][25] ([fdo#110728])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-skl6/igt@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-skl8/igt@[email protected]

* igt@prime_busy@hang-bsd2:
- shard-iclb: [PASS][26] -> [SKIP][27] ([fdo#109276]) +26 similar issues
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb4/igt@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-iclb6/igt@[email protected]

#### Possible fixes ####

* igt@gem_eio@in-flight-contexts-10ms:
- shard-hsw: [FAIL][28] ([fdo#111925]) -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-hsw4/igt@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-hsw6/igt@[email protected]

* igt@gem_eio@unwedge-stress:
- shard-snb: [FAIL][30] ([fdo#109661]) -> [PASS][31]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-snb5/igt@[email protected]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-snb6/igt@[email protected]

* igt@gem_exec_blt@dumb-buf-max:
- shard-apl: [INCOMPLETE][32] ([fdo#103927]) -> [PASS][33]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-apl4/igt@[email protected]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-apl8/igt@[email protected]

* igt@gem_exec_schedule@preempt-queue-bsd:
- shard-iclb: [SKIP][34] ([fdo#111325]) -> [PASS][35] +7 similar issues
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb4/igt@[email protected]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-iclb6/igt@[email protected]

* igt@gem_exec_schedule@preempt-queue-bsd1:
- shard-iclb: [SKIP][36] ([fdo#109276]) -> [PASS][37] +22 similar issues
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb6/igt@[email protected]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-iclb2/igt@[email protected]

* igt@gem_persistent_relocs@forked-faulting-reloc-thrashing:
- shard-skl: [DMESG-WARN][38] -> [PASS][39]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-skl1/igt@[email protected]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-skl10/igt@[email protected]

* igt@gem_tiled_swapping@non-threaded:
- shard-hsw: [INCOMPLETE][40] ([fdo#103540] / [fdo#108686]) -> [PASS][41]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-hsw8/igt@[email protected]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-hsw5/igt@[email protected]

* igt@gem_userptr_blits@dmabuf-sync:
- shard-hsw: [DMESG-WARN][42] ([fdo#111870]) -> [PASS][43]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-hsw1/igt@[email protected]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-hsw1/igt@[email protected]

* igt@gem_workarounds@suspend-resume-context:
- shard-apl: [DMESG-WARN][44] ([fdo#108566]) -> [PASS][45] +7 similar issues
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-apl7/igt@[email protected]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-apl3/igt@[email protected]

* igt@i915_selftest@live_hangcheck:
- shard-iclb: [INCOMPLETE][46] ([fdo#107713] / [fdo#108569]) -> [PASS][47]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb1/igt@i915_selftest@live_hangcheck.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-iclb1/igt@i915_selftest@live_hangcheck.html

* igt@kms_big_fb@x-tiled-16bpp-rotate-180:
- shard-snb: [SKIP][48] ([fdo#109271]) -> [PASS][49] +2 similar issues
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-snb1/igt@[email protected]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-snb1/igt@[email protected]

* igt@kms_color@pipe-b-ctm-0-25:
- shard-skl: [DMESG-WARN][50] ([fdo#106107]) -> [PASS][51]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-skl8/igt@[email protected]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-skl7/igt@[email protected]

* igt@kms_fbcon_fbt@psr-suspend:
- shard-iclb: [DMESG-WARN][52] -> [PASS][53]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb4/igt@[email protected]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-iclb6/igt@[email protected]

* igt@kms_flip@flip-vs-expired-vblank:
- shard-skl: [FAIL][54] ([fdo#105363]) -> [PASS][55]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-skl10/igt@[email protected]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-skl10/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-plflip-blt:
- shard-iclb: [FAIL][56] ([fdo#103167]) -> [PASS][57] +5 similar issues
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb5/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-plflip-blt.html
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-plflip-blt.html

* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [FAIL][58] ([fdo#108145]) -> [PASS][59]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-skl2/igt@[email protected]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-skl3/igt@[email protected]

* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-iclb: [FAIL][60] ([fdo#103166]) -> [PASS][61]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb1/igt@[email protected]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-iclb5/igt@[email protected]

* 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_7060/shard-iclb7/igt@kms_psr2_su@page_flip.html
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-iclb2/igt@kms_psr2_su@page_flip.html

* igt@kms_psr@psr2_primary_render:
- shard-iclb: [SKIP][64] ([fdo#109441]) -> [PASS][65]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb6/igt@kms_psr@psr2_primary_render.html
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-iclb2/igt@kms_psr@psr2_primary_render.html

* igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend:
- {shard-tglb}: [INCOMPLETE][66] ([fdo#111832] / [fdo#111850]) -> [PASS][67]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-tglb5/igt@[email protected]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-tglb1/igt@[email protected]

* igt@perf@short-reads:
- shard-apl: [FAIL][68] ([fdo#103183]) -> [PASS][69]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-apl4/igt@[email protected]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-apl3/igt@[email protected]

#### Warnings ####

* igt@gem_ctx_isolation@vcs1-nonpriv:
- shard-iclb: [FAIL][70] ([fdo#111329]) -> [SKIP][71] ([fdo#109276])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb1/igt@[email protected]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-iclb5/igt@[email protected]

* igt@gem_ctx_switch@legacy-bsd2:
- shard-iclb: [SKIP][72] ([fdo#109276]) -> [INCOMPLETE][73] ([fdo#107713])
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb6/igt@[email protected]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-iclb1/igt@[email protected]

* igt@gem_mocs_settings@mocs-reset-bsd2:
- shard-iclb: [SKIP][74] ([fdo#109276]) -> [FAIL][75] ([fdo#111330]) +2 similar issues
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb3/igt@[email protected]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-iclb1/igt@[email protected]

* igt@gem_mocs_settings@mocs-settings-bsd2:
- shard-iclb: [FAIL][76] ([fdo#111330]) -> [SKIP][77] ([fdo#109276])
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb4/igt@[email protected]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-iclb6/igt@[email protected]

* igt@kms_psr@psr2_suspend:
- shard-iclb: [DMESG-WARN][78] ([fdo#107724]) -> [SKIP][79] ([fdo#109441])
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb2/igt@kms_psr@psr2_suspend.html
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14762/shard-iclb4/igt@kms_psr@psr2_suspend.html

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#102365]: https://bugs.freedesktop.org/show_bug.cgi?id=102365
[fdo#102670]: https://bugs.freedesktop.org/show_bug.cgi?id=102670
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103183]: https://bugs.freedesktop.org/show_bug.cgi?id=103183
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
[fdo#106081]: https://bugs.freedesktop.org/show_bug.cgi?id=106081
[fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#109661]: https://bugs.freedesktop.org/show_bug.cgi?id=109661
[fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
[fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[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#111781]: https://bugs.freedesktop.org/show_bug.cgi?id=111781
[fdo#111832]: https://bugs.freedesktop.org/show_bug.cgi?id=111832
[fdo#111850]: https://bugs.freedesktop.org/show_bug.cgi?id=111850
[fdo#111870]: https://bugs.freedesktop.org/show_bug.cgi?id=111870
[fdo#111925]: https://bugs.freedesktop.org/show_bug.cgi?id=111925

Participating hosts (10 -> 11)
------------------------------

Additional (1): pig-skl-6260u

Build changes
-------------

* CI: CI-20190529 -> None
* Linux: CI_DRM_7060 -> Patchwork_14762

CI-20190529: 20190529
CI_DRM_7060: bac86c35889cffa19d3f7368904c542edde4fafc @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5220: 1e38e32d721210a780198c8293a6b8c8e881df68 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14762: 6b1507605ef813f39c00535fc81257872af2d3a1 @ 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_14762/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw
In reply to Vivek Kasireddy
Quoted 1 line · Vivek Kasireddy

On some platforms that have the MCC PCH, Port C's hotplug interrupt

Some?

Quoted 56 lines

bits are mapped to TC1 bits.

---
 drivers/gpu/drm/i915/display/intel_dp.c | 3 +++
 drivers/gpu/drm/i915/i915_irq.c         | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/intel_dp.c +3 -0
index 0e45c61d7331..6594f2af1257 100644
@@ -5282,6 +5282,9 @@ static bool icl_combo_port_connected(struct
 drm_i915_private *dev_priv,
 {
 	enum port port = intel_dig_port->base.port;
 
+	if (HAS_PCH_MCC(dev_priv) && port == PORT_C)
+		return I915_READ(SDEISR) &
 SDE_TC_HOTPLUG_ICP(PORT_TC1);
+
 	return I915_READ(SDEISR) & SDE_DDI_HOTPLUG_ICP(port);

}

drivers/gpu/drm/i915/i915_irq.c +2 -2
index 3af7f7914c40..a7c968b01af3 100644
@@ -2249,8 +2249,8 @@ static void icp_irq_handler(struct
 drm_i915_private *dev_priv, u32 pch_iir)
 		tc_port_hotplug_long_detect =
 tgp_tc_port_hotplug_long_detect;
 		pins = hpd_tgp;
 	} else if (HAS_PCH_MCC(dev_priv)) {
-		ddi_hotplug_trigger = pch_iir & SDE_DDI_MASK_TGP;
-		tc_hotplug_trigger = 0;
+		ddi_hotplug_trigger = pch_iir & SDE_DDI_MASK_ICP;
+		tc_hotplug_trigger = pch_iir &
 SDE_TC_HOTPLUG_ICP(PORT_TC1);
drivers/gpu/drm/i915/i915_irq.c +2 -2
 		pins = hpd_icp;
 	} else {
 		ddi_hotplug_trigger = pch_iir & SDE_DDI_MASK_ICP;
@@ -3377,8 +3377,8 @@ static void icp_hpd_irq_setup(struct
 drm_i915_private *dev_priv,
 static void mcc_hpd_irq_setup(struct drm_i915_private *dev_priv)
 {
 	icp_hpd_irq_setup(dev_priv,
-			  SDE_DDI_MASK_TGP, 0,
-			  TGP_DDI_HPD_ENABLE_MASK, 0,
+			  SDE_DDI_MASK_ICP,
 SDE_TC_HOTPLUG_ICP(PORT_TC1),
+			  ICP_DDI_HPD_ENABLE_MASK,
 ICP_TC_HPD_ENABLE(PORT_TC1),
Quoted 3 lines

hpd_icp);
}

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v1 1/1 Applied
#4 lore raw
In reply to Vivek Kasireddy
Quoted 5 lines · Vivek Kasireddy

On some platforms that have the MCC PCH, Port C's hotplug interrupt bits are mapped to TC1 bits.

As Jose pointed out, the "some" in the message here isn't correct; all MCC platforms should behave this way, and the other PCH we were working with previously turned out to be something different (not actually MCC); I'll send a separate patch to deal with that other PCH in the next day or two.

Aside from that,

Applied to dinq (with a tweaked commit message). Thanks for the patch.

Matt

Quoted 48 lines
---
 drivers/gpu/drm/i915/display/intel_dp.c | 3 +++
 drivers/gpu/drm/i915/i915_irq.c         | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/intel_dp.c +3 -0
index 0e45c61d7331..6594f2af1257 100644
@@ -5282,6 +5282,9 @@ static bool icl_combo_port_connected(struct drm_i915_private *dev_priv,
 {
 	enum port port = intel_dig_port->base.port;
 
+	if (HAS_PCH_MCC(dev_priv) && port == PORT_C)
+		return I915_READ(SDEISR) & SDE_TC_HOTPLUG_ICP(PORT_TC1);
+
 	return I915_READ(SDEISR) & SDE_DDI_HOTPLUG_ICP(port);
 }
 
drivers/gpu/drm/i915/i915_irq.c +4 -4
index 3af7f7914c40..a7c968b01af3 100644
@@ -2249,8 +2249,8 @@ static void icp_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
 		tc_port_hotplug_long_detect = tgp_tc_port_hotplug_long_detect;
 		pins = hpd_tgp;
 	} else if (HAS_PCH_MCC(dev_priv)) {
-		ddi_hotplug_trigger = pch_iir & SDE_DDI_MASK_TGP;
-		tc_hotplug_trigger = 0;
+		ddi_hotplug_trigger = pch_iir & SDE_DDI_MASK_ICP;
+		tc_hotplug_trigger = pch_iir & SDE_TC_HOTPLUG_ICP(PORT_TC1);
 		pins = hpd_icp;
 	} else {
 		ddi_hotplug_trigger = pch_iir & SDE_DDI_MASK_ICP;
@@ -3377,8 +3377,8 @@ static void icp_hpd_irq_setup(struct drm_i915_private *dev_priv,
 static void mcc_hpd_irq_setup(struct drm_i915_private *dev_priv)
 {
 	icp_hpd_irq_setup(dev_priv,
-			  SDE_DDI_MASK_TGP, 0,
-			  TGP_DDI_HPD_ENABLE_MASK, 0,
+			  SDE_DDI_MASK_ICP, SDE_TC_HOTPLUG_ICP(PORT_TC1),
+			  ICP_DDI_HPD_ENABLE_MASK, ICP_TC_HPD_ENABLE(PORT_TC1),
 			  hpd_icp);
 }
 
Signature · 1 line
2.21.0
Signature · 9 lines
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx