Skip to contentSkip to conversation

drm/i915/edp: fix eDP MSO pipe sanity checks for ADL-P

PATCH In review Jani Nikula 3 participants 5 messages Aug 12, 2021 – Aug 13, 2021

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

PATCH 1/1 drm/i915/edp: fix eDP MSO pipe sanity checks for ADL-P

ADL-P supports stream splitter on pipe B in addition to pipe A. Update the sanity check in intel_ddi_mso_get_config() to reflect this, and remove the check in intel_ddi_mso_configure() as redundant with encoder->pipe_mask. Abstract the splitter pipe mask to a single point of truth while at it to avoid similar mistakes in the future.

Fixes 7bc188cc2c8c ("drm/i915/adl_p: enable MSO on pipe B")
Cc Uma Shankar <[email protected]>
Cc Ville Syrjälä <[email protected]>
Cc Swati Sharma <[email protected]>
---
 drivers/gpu/drm/i915/display/intel_ddi.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi.c +12 -12
index e932fd0fe7e2..eb9aa871f87b 100644
@@ -2251,6 +2251,15 @@ static void intel_ddi_power_up_lanes(struct intel_encoder *encoder,
 	}
 }
 
+/* Splitter enable for eDP MSO is limited to certain pipes. */
+static u8 intel_ddi_splitter_pipe_mask(struct drm_i915_private *i915)
+{
+	if (IS_ALDERLAKE_P(i915))
+		return BIT(PIPE_A) | BIT(PIPE_B);
+	else
+		return BIT(PIPE_A);
+}
+
 static void intel_ddi_mso_get_config(struct intel_encoder *encoder,
 				     struct intel_crtc_state *pipe_config)
 {
@@ -2268,8 +2277,7 @@ static void intel_ddi_mso_get_config(struct intel_encoder *encoder,
 	if (!pipe_config->splitter.enable)
 		return;
 
-	/* Splitter enable is supported for pipe A only. */
-	if (drm_WARN_ON(&i915->drm, pipe != PIPE_A)) {
+	if (drm_WARN_ON(&i915->drm, !(intel_ddi_splitter_pipe_mask(i915) & BIT(pipe)))) {
 		pipe_config->splitter.enable = false;
 		return;
 	}
@@ -2301,10 +2309,6 @@ static void intel_ddi_mso_configure(const struct intel_crtc_state *crtc_state)
 		return;
 
 	if (crtc_state->splitter.enable) {
-		/* Splitter enable is supported for pipe A only. */
-		if (drm_WARN_ON(&i915->drm, pipe != PIPE_A))
-			return;
-
 		dss1 |= SPLITTER_ENABLE;
 		dss1 |= OVERLAP_PIXELS(crtc_state->splitter.pixel_overlap);
 		if (crtc_state->splitter.link_count == 2)
@@ -4666,12 +4670,8 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
 
 		dig_port->hpd_pulse = intel_dp_hpd_pulse;
 
-		/* Splitter enable for eDP MSO is limited to certain pipes. */
-		if (dig_port->dp.mso_link_count) {
-			encoder->pipe_mask = BIT(PIPE_A);
-			if (IS_ALDERLAKE_P(dev_priv))
-				encoder->pipe_mask |= BIT(PIPE_B);
-		}
+		if (dig_port->dp.mso_link_count)
+			encoder->pipe_mask = intel_ddi_splitter_pipe_mask(dev_priv);
 	}
 
 	/* In theory we don't need the encoder->type check, but leave it just in
Signature · 1 line
2.20.1
#1 lore raw

[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/edp: fix eDP MSO pipe sanity checks for ADL-P

== Series Details ==

== Series Details ==

Series: drm/i915/edp: fix eDP MSO pipe sanity checks for ADL-P
URL : https://patchwork.freedesktop.org/series/93640/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_10478 -> Patchwork_20807
====================================================

Summary
-------

**SUCCESS**

No regressions found.

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

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

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

### IGT changes ###

#### Issues hit ####

* igt@gem_exec_fence@basic-busy@bcs0:
- fi-kbl-soraka: NOTRUN -> [SKIP][1] ([fdo#109271]) +26 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/fi-kbl-soraka/igt@gem_exec_fence@[email protected]

* igt@gem_huc_copy@huc-copy:
- fi-kbl-soraka: NOTRUN -> [SKIP][2] ([fdo#109271] / [i915#2190])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/fi-kbl-soraka/igt@[email protected]

* igt@i915_pm_rpm@basic-rte:
- fi-kbl-soraka: NOTRUN -> [FAIL][3] ([i915#579])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/fi-kbl-soraka/igt@[email protected]

* igt@i915_selftest@live@gt_pm:
- fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][4] ([i915#1886] / [i915#2291])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/fi-kbl-soraka/igt@i915_selftest@live@gt_pm.html

* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-soraka: NOTRUN -> [SKIP][5] ([fdo#109271] / [fdo#111827]) +8 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/fi-kbl-soraka/igt@[email protected]

* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- fi-kbl-soraka: NOTRUN -> [SKIP][6] ([fdo#109271] / [i915#533])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/fi-kbl-soraka/igt@[email protected]

* igt@prime_vgem@basic-userptr:
- fi-pnv-d510: NOTRUN -> [SKIP][7] ([fdo#109271]) +48 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/fi-pnv-d510/igt@[email protected]

#### Possible fixes ####

* igt@gem_exec_parallel@engines@userptr:
- fi-pnv-d510: [INCOMPLETE][8] ([i915#299]) -> [PASS][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/fi-pnv-d510/igt@gem_exec_parallel@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/fi-pnv-d510/igt@gem_exec_parallel@[email protected]

* igt@gem_exec_suspend@basic-s3:
- fi-tgl-1115g4: [FAIL][10] ([i915#1888]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/fi-tgl-1115g4/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/fi-tgl-1115g4/igt@[email protected]

* igt@i915_selftest@live@gt_lrc:
- fi-rkl-guc: [DMESG-WARN][12] ([i915#3958]) -> [PASS][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/fi-rkl-guc/igt@i915_selftest@live@gt_lrc.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/fi-rkl-guc/igt@i915_selftest@live@gt_lrc.html

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1886]: https://gitlab.freedesktop.org/drm/intel/issues/1886
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2291]: https://gitlab.freedesktop.org/drm/intel/issues/2291
[i915#299]: https://gitlab.freedesktop.org/drm/intel/issues/299
[i915#3958]: https://gitlab.freedesktop.org/drm/intel/issues/3958
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#579]: https://gitlab.freedesktop.org/drm/intel/issues/579

Participating hosts (38 -> 35)
------------------------------

Additional (1): fi-kbl-soraka
Missing (4): fi-bdw-samus fi-bsw-cyan bat-jsl-1 fi-hsw-4200u

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

* Linux: CI_DRM_10478 -> Patchwork_20807

CI-20190529: 20190529
CI_DRM_10478: d65ef4634e5c795a6a4df1d198992c70e9692fb3 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6174: 0de07aea208ea848066f4f6af04c13e25d23d9a7 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_20807: 6609a8a347e73bb3da4a0f9d52ea6d95ddce6920 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

6609a8a347e7 drm/i915/edp: fix eDP MSO pipe sanity checks for ADL-P

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/index.html

#2 lore raw

[Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915/edp: fix eDP MSO pipe sanity checks for ADL-P

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915/edp: fix eDP MSO pipe sanity checks for ADL-P
URL : https://patchwork.freedesktop.org/series/93640/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_10478_full -> Patchwork_20807_full
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with Patchwork_20807_full absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_20807_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_20807_full:

### IGT changes ###

#### Possible regressions ####

* igt@kms_frontbuffer_tracking@psr-slowdraw:
- shard-skl: [PASS][1] -> [FAIL][2] +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-skl9/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-skl5/igt@[email protected]

* igt@kms_plane@plane-position-hole-dpms@pipe-b-planes:
- shard-kbl: [PASS][3] -> [FAIL][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-kbl2/igt@kms_plane@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-kbl3/igt@kms_plane@[email protected]

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

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

### IGT changes ###

#### Issues hit ####

* igt@gem_ctx_persistence@legacy-engines-hang:
- shard-snb: NOTRUN -> [SKIP][5] ([fdo#109271] / [i915#1099])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-snb5/igt@[email protected]

* igt@gem_ctx_persistence@many-contexts:
- shard-tglb: [PASS][6] -> [FAIL][7] ([i915#2410])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-tglb2/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-tglb1/igt@[email protected]

* igt@gem_eio@unwedge-stress:
- shard-tglb: [PASS][8] -> [TIMEOUT][9] ([i915#2369] / [i915#3063] / [i915#3648])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-tglb7/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-tglb3/igt@[email protected]

* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-kbl: [PASS][10] -> [FAIL][11] ([i915#2842]) +1 similar issue
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-kbl3/igt@gem_exec_fair@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-kbl4/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-none@vcs0:
- shard-apl: NOTRUN -> [FAIL][12] ([i915#2842])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-apl1/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-none@vecs0:
- shard-apl: NOTRUN -> [FAIL][13] ([i915#2842] / [i915#3468])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-apl1/igt@gem_exec_fair@[email protected]

* igt@gem_mmap_gtt@cpuset-medium-copy-odd:
- shard-iclb: [PASS][14] -> [FAIL][15] ([i915#2428])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-iclb4/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-iclb8/igt@[email protected]

* igt@gem_pwrite@basic-exhaustion:
- shard-skl: NOTRUN -> [WARN][16] ([i915#2658])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-skl2/igt@[email protected]

* igt@gem_userptr_blits@input-checking:
- shard-apl: NOTRUN -> [DMESG-WARN][17] ([i915#3002])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-apl2/igt@[email protected]

* igt@gem_userptr_blits@vma-merge:
- shard-apl: NOTRUN -> [FAIL][18] ([i915#3318])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-apl2/igt@[email protected]

* igt@gen7_exec_parse@basic-offset:
- shard-apl: NOTRUN -> [SKIP][19] ([fdo#109271]) +246 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-apl2/igt@[email protected]

* igt@gen9_exec_parse@allowed-single:
- shard-skl: NOTRUN -> [DMESG-WARN][20] ([i915#1436] / [i915#716])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-skl4/igt@[email protected]

* igt@i915_suspend@debugfs-reader:
- shard-skl: [PASS][21] -> [INCOMPLETE][22] ([i915#198])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-skl4/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-skl4/igt@[email protected]

* igt@kms_big_fb@x-tiled-32bpp-rotate-0:
- shard-glk: [PASS][23] -> [DMESG-WARN][24] ([i915#118] / [i915#95])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-glk3/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-glk8/igt@[email protected]

* igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-0-hflip:
- shard-skl: NOTRUN -> [SKIP][25] ([fdo#109271] / [i915#3777])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-skl2/igt@[email protected]

* igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0-hflip:
- shard-apl: NOTRUN -> [SKIP][26] ([fdo#109271] / [i915#3777])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-apl6/igt@[email protected]

* igt@kms_ccs@pipe-a-bad-pixel-format-y_tiled_gen12_mc_ccs:
- shard-glk: NOTRUN -> [SKIP][27] ([fdo#109271] / [i915#3886]) +3 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-glk7/igt@kms_ccs@pipe-a-bad-pixel-format-y_tiled_gen12_mc_ccs.html

* igt@kms_ccs@pipe-a-random-ccs-data-y_tiled_gen12_rc_ccs_cc:
- shard-kbl: NOTRUN -> [SKIP][28] ([fdo#109271] / [i915#3886]) +4 similar issues
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-kbl4/igt@kms_ccs@pipe-a-random-ccs-data-y_tiled_gen12_rc_ccs_cc.html

* igt@kms_ccs@pipe-b-crc-sprite-planes-basic-y_tiled_gen12_rc_ccs_cc:
- shard-apl: NOTRUN -> [SKIP][29] ([fdo#109271] / [i915#3886]) +11 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-apl1/igt@kms_ccs@pipe-b-crc-sprite-planes-basic-y_tiled_gen12_rc_ccs_cc.html

* igt@kms_ccs@pipe-c-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc:
- shard-skl: NOTRUN -> [SKIP][30] ([fdo#109271] / [i915#3886]) +3 similar issues
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-skl4/igt@kms_ccs@pipe-c-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc.html

* igt@kms_ccs@pipe-d-missing-ccs-buffer-yf_tiled_ccs:
- shard-tglb: NOTRUN -> [SKIP][31] ([i915#3689])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-tglb5/igt@kms_ccs@pipe-d-missing-ccs-buffer-yf_tiled_ccs.html

* igt@kms_chamelium@dp-hpd-with-enabled-mode:
- shard-glk: NOTRUN -> [SKIP][32] ([fdo#109271] / [fdo#111827]) +7 similar issues
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-glk3/igt@[email protected]

* igt@kms_chamelium@dp-mode-timings:
- shard-apl: NOTRUN -> [SKIP][33] ([fdo#109271] / [fdo#111827]) +17 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-apl2/igt@[email protected]

* igt@kms_color_chamelium@pipe-d-ctm-0-5:
- shard-snb: NOTRUN -> [SKIP][34] ([fdo#109271] / [fdo#111827]) +10 similar issues
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-snb7/igt@[email protected]

* igt@kms_color_chamelium@pipe-d-ctm-0-75:
- shard-skl: NOTRUN -> [SKIP][35] ([fdo#109271] / [fdo#111827]) +3 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-skl2/igt@[email protected]

* igt@kms_color_chamelium@pipe-d-ctm-green-to-red:
- shard-kbl: NOTRUN -> [SKIP][36] ([fdo#109271] / [fdo#111827]) +4 similar issues
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-kbl1/igt@[email protected]

* igt@kms_content_protection@legacy:
- shard-kbl: NOTRUN -> [TIMEOUT][37] ([i915#1319])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-kbl4/igt@[email protected]
- shard-apl: NOTRUN -> [TIMEOUT][38] ([i915#1319])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-apl2/igt@[email protected]

* igt@kms_content_protection@srm:
- shard-glk: NOTRUN -> [SKIP][39] ([fdo#109271]) +56 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-glk3/igt@[email protected]

* igt@kms_content_protection@uevent:
- shard-apl: NOTRUN -> [FAIL][40] ([i915#2105])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-apl6/igt@[email protected]

* igt@kms_cursor_legacy@cursorb-vs-flipb-legacy:
- shard-tglb: NOTRUN -> [SKIP][41] ([fdo#111825])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-tglb1/igt@[email protected]

* igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-atomic:
- shard-apl: [PASS][42] -> [DMESG-WARN][43] ([IGT#6])
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-apl3/igt@[email protected]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-apl8/igt@[email protected]

* igt@kms_cursor_legacy@flip-vs-cursor-legacy:
- shard-skl: [PASS][44] -> [FAIL][45] ([i915#2346])
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-skl3/igt@[email protected]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-skl6/igt@[email protected]

* igt@kms_fbcon_fbt@fbc-suspend:
- shard-kbl: [PASS][46] -> [INCOMPLETE][47] ([i915#155] / [i915#180] / [i915#636])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-kbl2/igt@[email protected]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-kbl3/igt@[email protected]

* igt@kms_flip@flip-vs-suspend-interruptible@c-dp1:
- shard-apl: NOTRUN -> [DMESG-WARN][48] ([i915#180]) +1 similar issue
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-apl6/igt@kms_flip@[email protected]

* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs:
- shard-kbl: NOTRUN -> [SKIP][49] ([fdo#109271] / [i915#2672]) +1 similar issue
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-kbl1/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs.html
- shard-apl: NOTRUN -> [SKIP][50] ([fdo#109271] / [i915#2672]) +1 similar issue
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-apl2/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs.html

* igt@kms_frontbuffer_tracking@psr-rgb101010-draw-mmap-wc:
- shard-kbl: NOTRUN -> [SKIP][51] ([fdo#109271]) +56 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-kbl1/igt@[email protected]

* igt@kms_hdr@bpc-switch-suspend:
- shard-kbl: [PASS][52] -> [DMESG-WARN][53] ([i915#180]) +5 similar issues
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-kbl7/igt@[email protected]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-kbl3/igt@[email protected]

* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- shard-glk: NOTRUN -> [SKIP][54] ([fdo#109271] / [i915#533])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-glk3/igt@[email protected]

* igt@kms_pipe_crc_basic@read-crc-pipe-d:
- shard-skl: NOTRUN -> [SKIP][55] ([fdo#109271] / [i915#533])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-skl2/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb:
- shard-apl: NOTRUN -> [FAIL][56] ([fdo#108145] / [i915#265])
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-apl2/igt@[email protected]
- shard-kbl: NOTRUN -> [FAIL][57] ([fdo#108145] / [i915#265])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-kbl1/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: NOTRUN -> [FAIL][58] ([fdo#108145] / [i915#265])
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-skl3/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-b-alpha-transparent-fb:
- shard-apl: NOTRUN -> [FAIL][59] ([i915#265])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-apl7/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-max:
- shard-glk: NOTRUN -> [FAIL][60] ([fdo#108145] / [i915#265])
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-glk3/igt@[email protected]

* igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping:
- shard-glk: NOTRUN -> [SKIP][61] ([fdo#109271] / [i915#2733])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-glk3/igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping.html

* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-3:
- shard-kbl: NOTRUN -> [SKIP][62] ([fdo#109271] / [i915#658])
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-kbl1/igt@[email protected]

* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-4:
- shard-glk: NOTRUN -> [SKIP][63] ([fdo#109271] / [i915#658]) +1 similar issue
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-glk7/igt@[email protected]

* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-5:
- shard-apl: NOTRUN -> [SKIP][64] ([fdo#109271] / [i915#658]) +3 similar issues
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-apl1/igt@[email protected]
- shard-skl: NOTRUN -> [SKIP][65] ([fdo#109271] / [i915#658]) +2 similar issues
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-skl3/igt@[email protected]

* igt@kms_psr@psr2_cursor_mmap_cpu:
- shard-iclb: [PASS][66] -> [SKIP][67] ([fdo#109441]) +1 similar issue
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-iclb6/igt@kms_psr@psr2_cursor_mmap_cpu.html

* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- shard-kbl: [PASS][68] -> [DMESG-WARN][69] ([i915#180] / [i915#295])
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-kbl6/igt@[email protected]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-kbl3/igt@[email protected]

* igt@kms_vblank@pipe-d-query-forked-busy:
- shard-skl: NOTRUN -> [SKIP][70] ([fdo#109271]) +47 similar issues
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-skl8/igt@[email protected]

* igt@kms_vblank@pipe-d-query-forked-hang:
- shard-snb: NOTRUN -> [SKIP][71] ([fdo#109271]) +218 similar issues
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-snb7/igt@[email protected]

* igt@perf@polling:
- shard-skl: [PASS][72] -> [FAIL][73] ([i915#1542])
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-skl5/igt@[email protected]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-skl4/igt@[email protected]

* igt@sysfs_clients@create:
- shard-apl: NOTRUN -> [SKIP][74] ([fdo#109271] / [i915#2994]) +3 similar issues
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-apl2/igt@[email protected]

* igt@sysfs_clients@fair-3:
- shard-glk: NOTRUN -> [SKIP][75] ([fdo#109271] / [i915#2994])
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-glk3/igt@[email protected]

* igt@sysfs_clients@fair-7:
- shard-skl: NOTRUN -> [SKIP][76] ([fdo#109271] / [i915#2994]) +1 similar issue
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-skl2/igt@[email protected]

* igt@sysfs_clients@sema-25:
- shard-kbl: NOTRUN -> [SKIP][77] ([fdo#109271] / [i915#2994]) +1 similar issue
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-kbl4/igt@[email protected]

#### Possible fixes ####

* igt@gem_eio@in-flight-contexts-immediate:
- shard-tglb: [TIMEOUT][78] ([i915#3063]) -> [PASS][79]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-tglb5/igt@[email protected]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-tglb5/igt@[email protected]

* igt@gem_eio@in-flight-suspend:
- shard-kbl: [DMESG-WARN][80] ([i915#180]) -> [PASS][81] +1 similar issue
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-kbl4/igt@[email protected]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-kbl1/igt@[email protected]

* igt@gem_exec_fair@basic-none-vip@rcs0:
- shard-tglb: [FAIL][82] ([i915#2842]) -> [PASS][83]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-tglb7/igt@gem_exec_fair@[email protected]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-tglb2/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-glk: [FAIL][84] ([i915#2842]) -> [PASS][85]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-glk6/igt@gem_exec_fair@[email protected]
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-glk9/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace@vcs0:
- shard-iclb: [FAIL][86] ([i915#2842]) -> [PASS][87] +2 similar issues
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-iclb8/igt@gem_exec_fair@[email protected]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-iclb7/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace@vcs1:
- shard-kbl: [FAIL][88] ([i915#2842]) -> [PASS][89]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-kbl7/igt@gem_exec_fair@[email protected]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-kbl3/igt@gem_exec_fair@[email protected]

* igt@gem_exec_flush@basic-wb-ro-default:
- shard-glk: [INCOMPLETE][90] -> [PASS][91]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-glk5/igt@[email protected]
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-glk7/igt@[email protected]

* igt@gem_exec_schedule@u-independent@vecs0:
- shard-iclb: [FAIL][92] ([i915#3795]) -> [PASS][93]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-iclb8/igt@gem_exec_schedule@[email protected]
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-iclb2/igt@gem_exec_schedule@[email protected]

* igt@gem_mmap_gtt@cpuset-big-copy-odd:
- shard-iclb: [FAIL][94] ([i915#2428]) -> [PASS][95]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-iclb5/igt@[email protected]
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-iclb5/igt@[email protected]

* igt@gem_mmap_gtt@cpuset-big-copy-xy:
- shard-iclb: [FAIL][96] ([i915#307]) -> [PASS][97] +1 similar issue
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-iclb8/igt@[email protected]
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-iclb2/igt@[email protected]

* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-apl: [DMESG-WARN][98] ([i915#180]) -> [PASS][99]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-apl1/igt@[email protected]
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-apl2/igt@[email protected]

* igt@kms_flip@flip-vs-expired-vblank@a-edp1:
- shard-skl: [FAIL][100] ([i915#2122]) -> [PASS][101]
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-skl1/igt@kms_flip@[email protected]
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-skl7/igt@kms_flip@[email protected]

* igt@kms_hdr@bpc-switch-suspend:
- shard-skl: [FAIL][102] ([i915#1188]) -> [PASS][103]
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-skl2/igt@[email protected]
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-skl9/igt@[email protected]

* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [SKIP][104] ([fdo#109441]) -> [PASS][105] +3 similar issues
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-iclb4/igt@kms_psr@psr2_sprite_plane_move.html
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html

* igt@kms_vblank@pipe-b-ts-continuation-suspend:
- shard-skl: [INCOMPLETE][106] ([i915#198] / [i915#2828]) -> [PASS][107]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-skl1/igt@[email protected]
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-skl4/igt@[email protected]

#### Warnings ####

* igt@gem_exec_fair@basic-throttle@rcs0:
- shard-iclb: [FAIL][108] ([i915#2849]) -> [FAIL][109] ([i915#2842])
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-iclb4/igt@gem_exec_fair@[email protected]
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-iclb2/igt@gem_exec_fair@[email protected]

* igt@i915_pm_rc6_residency@rc6-idle:
- shard-iclb: [FAIL][110] ([i915#2680]) -> [WARN][111] ([i915#2684])
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-iclb4/igt@[email protected]
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-iclb8/igt@[email protected]

* igt@kms_psr2_sf@plane-move-sf-dmg-area-2:
- shard-iclb: [SKIP][112] ([i915#2920]) -> [SKIP][113] ([i915#658]) +1 similar issue
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-iclb2/igt@[email protected]
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-iclb6/igt@[email protected]

* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-2:
- shard-iclb: [SKIP][114] ([i915#658]) -> [SKIP][115] ([i915#2920]) +2 similar issues
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-iclb7/igt@[email protected]
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-iclb2/igt@[email protected]

* igt@runner@aborted:
- shard-kbl: ([FAIL][116], [FAIL][117], [FAIL][118], [FAIL][119], [FAIL][120], [FAIL][121]) ([i915#1436] / [i915#180] / [i915#1814] / [i915#3002] / [i915#3363] / [i915#602]) -> ([FAIL][122], [FAIL][123], [FAIL][124], [FAIL][125], [FAIL][126], [FAIL][127], [FAIL][128], [FAIL][129], [FAIL][130], [FAIL][131]) ([i915#1436] / [i915#180] / [i915#1814] / [i915#3002] / [i915#3363] / [i915#602] / [i915#92])
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-kbl4/igt@[email protected]
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-kbl7/igt@[email protected]
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-kbl4/igt@[email protected]
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-kbl3/igt@[email protected]
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-kbl7/igt@[email protected]
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-kbl2/igt@[email protected]
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-kbl7/igt@[email protected]
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-kbl7/igt@[email protected]
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-kbl7/igt@[email protected]
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-kbl4/igt@[email protected]
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-kbl3/igt@[email protected]
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-kbl3/igt@[email protected]
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-kbl3/igt@[email protected]
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-kbl2/igt@[email protected]
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-kbl3/igt@[email protected]
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-kbl3/igt@[email protected]
- shard-apl: ([FAIL][132], [FAIL][133], [FAIL][134]) ([fdo#109271] / [i915#1814] / [i915#3002] / [i915#3363]) -> ([FAIL][135], [FAIL][136], [FAIL][137]) ([i915#180] / [i915#3002] / [i915#3363])
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-apl1/igt@[email protected]
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-apl3/igt@[email protected]
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-apl1/igt@[email protected]
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-apl6/igt@[email protected]
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-apl2/igt@[email protected]
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-apl7/igt@[email protected]
- shard-glk: ([FAIL][138], [FAIL][139], [FAIL][140], [FAIL][141], [FAIL][142]) ([i915#1814] / [i915#2426] / [i915#2722] / [i915#3002] / [i915#3363] / [k.org#202321]) -> ([FAIL][143], [FAIL][144], [FAIL][145], [FAIL][146]) ([i915#1814] / [i915#2426] / [i915#3002] / [i915#3363] / [k.org#202321])
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-glk7/igt@[email protected]
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-glk7/igt@[email protected]
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-glk1/igt@[email protected]
[141]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-glk6/igt@[email protected]
[142]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-glk5/igt@[email protected]
[143]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-glk8/igt@[email protected]
[144]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-glk6/igt@[email protected]
[145]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-glk8/igt@[email protected]
[146]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-glk4/igt@[email protected]
- shard-skl: ([FAIL][147], [FAIL][148], [FAIL][149]) ([i915#1814] / [i915#2029] / [i915#3002] / [i915#3363]) -> ([FAIL][150], [FAIL][151], [FAIL][152]) ([i915#1436] / [i915#3002] / [i915#3363])
[147]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-skl6/igt@[email protected]
[148]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-skl2/igt@[email protected]
[149]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10478/shard-skl8/igt@[email protected]
[150]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-skl4/igt@[email protected]
[151]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-skl10/igt@[email protected]
[152]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/shard-skl4/igt@[email protected]

[IGT#6]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/6
[fdo#108145]: https://bugs.freedesktop.org/show_bu

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20807/index.html

#3 lore raw
In reply to Jani Nikula

Please check CI results once; if regressions are unrelated please report. With those fixed.

Reviewed-by:
Swati Sharma <[email protected]>
Tested-by:
Swati Sharma <[email protected]>

Quoted 72 lines · Jani Nikula

ADL-P supports stream splitter on pipe B in addition to pipe A. Update the sanity check in intel_ddi_mso_get_config() to reflect this, and remove the check in intel_ddi_mso_configure() as redundant with encoder->pipe_mask. Abstract the splitter pipe mask to a single point of truth while at it to avoid similar mistakes in the future.

Fixes 7bc188cc2c8c ("drm/i915/adl_p: enable MSO on pipe B")
Cc Uma Shankar <[email protected]>
Cc Ville Syrjälä <[email protected]>
Cc Swati Sharma <[email protected]>
---
  drivers/gpu/drm/i915/display/intel_ddi.c | 24 ++++++++++++------------
  1 file changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi.c +12 -12
index e932fd0fe7e2..eb9aa871f87b 100644
@@ -2251,6 +2251,15 @@ static void intel_ddi_power_up_lanes(struct intel_encoder *encoder,
  	}
  }
 
+/* Splitter enable for eDP MSO is limited to certain pipes. */
+static u8 intel_ddi_splitter_pipe_mask(struct drm_i915_private *i915)
+{
+	if (IS_ALDERLAKE_P(i915))
+		return BIT(PIPE_A) | BIT(PIPE_B);
+	else
+		return BIT(PIPE_A);
+}
+
  static void intel_ddi_mso_get_config(struct intel_encoder *encoder,
  				     struct intel_crtc_state *pipe_config)
  {
@@ -2268,8 +2277,7 @@ static void intel_ddi_mso_get_config(struct intel_encoder *encoder,
  	if (!pipe_config->splitter.enable)
  		return;
 
-	/* Splitter enable is supported for pipe A only. */
-	if (drm_WARN_ON(&i915->drm, pipe != PIPE_A)) {
+	if (drm_WARN_ON(&i915->drm, !(intel_ddi_splitter_pipe_mask(i915) & BIT(pipe)))) {
  		pipe_config->splitter.enable = false;
  		return;
  	}
@@ -2301,10 +2309,6 @@ static void intel_ddi_mso_configure(const struct intel_crtc_state *crtc_state)
  		return;
 
  	if (crtc_state->splitter.enable) {
-		/* Splitter enable is supported for pipe A only. */
-		if (drm_WARN_ON(&i915->drm, pipe != PIPE_A))
-			return;
-
  		dss1 |= SPLITTER_ENABLE;
  		dss1 |= OVERLAP_PIXELS(crtc_state->splitter.pixel_overlap);
  		if (crtc_state->splitter.link_count == 2)
@@ -4666,12 +4670,8 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
 
  		dig_port->hpd_pulse = intel_dp_hpd_pulse;
 
-		/* Splitter enable for eDP MSO is limited to certain pipes. */
-		if (dig_port->dp.mso_link_count) {
-			encoder->pipe_mask = BIT(PIPE_A);
-			if (IS_ALDERLAKE_P(dev_priv))
-				encoder->pipe_mask |= BIT(PIPE_B);
-		}
+		if (dig_port->dp.mso_link_count)
+			encoder->pipe_mask = intel_ddi_splitter_pipe_mask(dev_priv);
  	}
 
  	/* In theory we don't need the encoder->type check, but leave it just in
Signature · 1 line
~Swati Sharma
#4 lore raw
Quoted 7 lines · On Fri, 13 Aug 2021, "Sharma, Swati2" <[email protected]> wrote:

Please check CI results once; if regressions are unrelated please report. With those fixed.

Reviewed-by:
Swati Sharma <[email protected]>
Tested-by:
Swati Sharma <[email protected]>

Thanks, pushed. The CI failures are unrelated.

BR,
Jani.

Quoted 74 lines · Jani Nikula
Quoted 72 lines

ADL-P supports stream splitter on pipe B in addition to pipe A. Update the sanity check in intel_ddi_mso_get_config() to reflect this, and remove the check in intel_ddi_mso_configure() as redundant with encoder->pipe_mask. Abstract the splitter pipe mask to a single point of truth while at it to avoid similar mistakes in the future.

Fixes 7bc188cc2c8c ("drm/i915/adl_p: enable MSO on pipe B")
Cc Uma Shankar <[email protected]>
Cc Ville Syrjälä <[email protected]>
Cc Swati Sharma <[email protected]>
---
  drivers/gpu/drm/i915/display/intel_ddi.c | 24 ++++++++++++------------
  1 file changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi.c +12 -12
index e932fd0fe7e2..eb9aa871f87b 100644
@@ -2251,6 +2251,15 @@ static void intel_ddi_power_up_lanes(struct intel_encoder *encoder,
  	}
  }
 
+/* Splitter enable for eDP MSO is limited to certain pipes. */
+static u8 intel_ddi_splitter_pipe_mask(struct drm_i915_private *i915)
+{
+	if (IS_ALDERLAKE_P(i915))
+		return BIT(PIPE_A) | BIT(PIPE_B);
+	else
+		return BIT(PIPE_A);
+}
+
  static void intel_ddi_mso_get_config(struct intel_encoder *encoder,
  				     struct intel_crtc_state *pipe_config)
  {
@@ -2268,8 +2277,7 @@ static void intel_ddi_mso_get_config(struct intel_encoder *encoder,
  	if (!pipe_config->splitter.enable)
  		return;
 
-	/* Splitter enable is supported for pipe A only. */
-	if (drm_WARN_ON(&i915->drm, pipe != PIPE_A)) {
+	if (drm_WARN_ON(&i915->drm, !(intel_ddi_splitter_pipe_mask(i915) & BIT(pipe)))) {
  		pipe_config->splitter.enable = false;
  		return;
  	}
@@ -2301,10 +2309,6 @@ static void intel_ddi_mso_configure(const struct intel_crtc_state *crtc_state)
  		return;
 
  	if (crtc_state->splitter.enable) {
-		/* Splitter enable is supported for pipe A only. */
-		if (drm_WARN_ON(&i915->drm, pipe != PIPE_A))
-			return;
-
  		dss1 |= SPLITTER_ENABLE;
  		dss1 |= OVERLAP_PIXELS(crtc_state->splitter.pixel_overlap);
  		if (crtc_state->splitter.link_count == 2)
@@ -4666,12 +4670,8 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
 
  		dig_port->hpd_pulse = intel_dp_hpd_pulse;
 
-		/* Splitter enable for eDP MSO is limited to certain pipes. */
-		if (dig_port->dp.mso_link_count) {
-			encoder->pipe_mask = BIT(PIPE_A);
-			if (IS_ALDERLAKE_P(dev_priv))
-				encoder->pipe_mask |= BIT(PIPE_B);
-		}
+		if (dig_port->dp.mso_link_count)
+			encoder->pipe_mask = intel_ddi_splitter_pipe_mask(dev_priv);
  	}
 
  	/* In theory we don't need the encoder->type check, but leave it just in
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center