[PATCH v2] drm/i915: update eDP MSO pipe mask for newer platforms

[PATCH v2] drm/i915: update eDP MSO pipe mask for newer platforms

[Luca Coelho]

Starting from display version 14, pipes A and B are supported in eDP
MSO.  After display version 20 there are no restrictions.

Update the function that returns the pipe mask for eDP MSO
accordingly.

Bspec: 68923, 55473
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: James Ausmus <james.ausmus@intel.com>
Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---

In v2:
   * allow pipes A and B from ver 14 to 20 [Gustavo]


drivers/gpu/drm/i915/display/intel_ddi.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index 922194b957be..29a616a8e72d 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -2336,13 +2336,20 @@ static void intel_ddi_power_up_lanes(struct intel_encoder *encoder,
 	}
 }
 
-/* Splitter enable for eDP MSO is limited to certain pipes. */
+/*
+ * Splitter enable for eDP MSO is limited to certain pipes on certain
+ * platforms.
+ */
 static u8 intel_ddi_splitter_pipe_mask(struct drm_i915_private *i915)
 {
-	if (IS_ALDERLAKE_P(i915))
+
+	if (IS_ALDERLAKE_P(i915) ||
+	    IS_DISPLAY_IP_RANGE(i915, IP_VER(14, 0), IP_VER(20, 0)))
 		return BIT(PIPE_A) | BIT(PIPE_B);
-	else
+	else if (DISPLAY_VER(i915) < 14)
 		return BIT(PIPE_A);
+
+	return ~0;
 }
 
 static void intel_ddi_mso_get_config(struct intel_encoder *encoder,
-- 
2.39.2

Re: [PATCH v2] drm/i915: update eDP MSO pipe mask for newer platforms

[Ville Syrjälä]

On Fri, Jan 26, 2024 at 12:03:09PM +0200, Luca Coelho wrote:
> Starting from display version 14, pipes A and B are supported in eDP
> MSO.  After display version 20 there are no restrictions.
> 
> Update the function that returns the pipe mask for eDP MSO
> accordingly.
> 
> Bspec: 68923, 55473
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: James Ausmus <james.ausmus@intel.com>
> Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
> Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
> ---
> 
> In v2:
>    * allow pipes A and B from ver 14 to 20 [Gustavo]
> 
> 
> drivers/gpu/drm/i915/display/intel_ddi.c | 13 ++++++++++---
>  1 file changed, 10 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index 922194b957be..29a616a8e72d 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -2336,13 +2336,20 @@ static void intel_ddi_power_up_lanes(struct intel_encoder *encoder,
>  	}
>  }
>  
> -/* Splitter enable for eDP MSO is limited to certain pipes. */
> +/*
> + * Splitter enable for eDP MSO is limited to certain pipes on certain
> + * platforms.
> + */
>  static u8 intel_ddi_splitter_pipe_mask(struct drm_i915_private *i915)
>  {
> -	if (IS_ALDERLAKE_P(i915))
> +
> +	if (IS_ALDERLAKE_P(i915) ||
> +	    IS_DISPLAY_IP_RANGE(i915, IP_VER(14, 0), IP_VER(20, 0)))
>  		return BIT(PIPE_A) | BIT(PIPE_B);
> -	else
> +	else if (DISPLAY_VER(i915) < 14)
>  		return BIT(PIPE_A);
> +
> +	return ~0;

That looks rather confusing. I'd make it something like:

if (VER >= whatever_is_the_new_version_that_i_can't_easily_find_from_bspec)
	return ~0;
else if (VER >= 14 || ADL)
	return A | B;
else
	return A;


>  }
>  
>  static void intel_ddi_mso_get_config(struct intel_encoder *encoder,
> -- 
> 2.39.2

-- 
Ville Syrjälä
Intel

✗ Fi.CI.CHECKPATCH: warning for drm/i915: update eDP MSO pipe mask for newer platforms

[Patchwork]

== Series Details ==

Series: drm/i915: update eDP MSO pipe mask for newer platforms
URL   : https://patchwork.freedesktop.org/series/129191/
State : warning

== Summary ==

Error: dim checkpatch failed
de4c77b139ce drm/i915: update eDP MSO pipe mask for newer platforms
-:34: CHECK:BRACES: Blank lines aren't necessary after an open brace '{'
#34: FILE: drivers/gpu/drm/i915/display/intel_ddi.c:2345:
 {
+

total: 0 errors, 0 warnings, 1 checks, 23 lines checked

✗ Fi.CI.BAT: failure for drm/i915: update eDP MSO pipe mask for newer platforms

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 5045 bytes --]

== Series Details ==

Series: drm/i915: update eDP MSO pipe mask for newer platforms
URL   : https://patchwork.freedesktop.org/series/129191/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_14181 -> Patchwork_129191v1
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with Patchwork_129191v1 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_129191v1, please notify your bug team (I915-ci-infra@lists.freedesktop.org) to allow them
  to document this new failure mode, which will reduce false positives in CI.

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

Participating hosts (37 -> 18)
------------------------------

  ERROR: It appears as if the changes made in Patchwork_129191v1 prevented too many machines from booting.

  Missing    (19): fi-rkl-11600 fi-apl-guc bat-adlp-6 fi-snb-2520m fi-blb-e6850 bat-rpls-2 fi-skl-6600u fi-elk-e7500 bat-jsl-3 fi-bsw-nick fi-kbl-7567u bat-adlp-9 fi-skl-guc bat-mtlp-6 fi-tgl-1115g4 fi-cfl-guc fi-kbl-x1275 fi-cfl-8109u bat-dg2-14 

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

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

### IGT changes ###

#### Issues hit ####

  * igt@gem_lmem_swapping@parallel-random-engines:
    - bat-adlm-1:         NOTRUN -> [SKIP][1] ([i915#4613]) +3 other tests skip
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_129191v1/bat-adlm-1/igt@gem_lmem_swapping@parallel-random-engines.html

  * igt@i915_pm_rps@basic-api:
    - bat-adlm-1:         NOTRUN -> [SKIP][2] ([i915#6621])
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_129191v1/bat-adlm-1/igt@i915_pm_rps@basic-api.html

  * igt@kms_force_connector_basic@force-load-detect:
    - bat-adlm-1:         NOTRUN -> [SKIP][3] ([fdo#109285])
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_129191v1/bat-adlm-1/igt@kms_force_connector_basic@force-load-detect.html

  * igt@kms_frontbuffer_tracking@basic:
    - bat-adlm-1:         NOTRUN -> [SKIP][4] ([i915#1849] / [i915#4342])
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_129191v1/bat-adlm-1/igt@kms_frontbuffer_tracking@basic.html

  * igt@kms_pipe_crc_basic@hang-read-crc:
    - bat-adlm-1:         NOTRUN -> [SKIP][5] ([i915#9875] / [i915#9900]) +6 other tests skip
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_129191v1/bat-adlm-1/igt@kms_pipe_crc_basic@hang-read-crc.html

  * igt@kms_pm_backlight@basic-brightness:
    - bat-adlm-1:         NOTRUN -> [SKIP][6] ([i915#5354])
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_129191v1/bat-adlm-1/igt@kms_pm_backlight@basic-brightness.html

  * igt@kms_setmode@basic-clone-single-crtc:
    - bat-adlm-1:         NOTRUN -> [SKIP][7] ([i915#3555])
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_129191v1/bat-adlm-1/igt@kms_setmode@basic-clone-single-crtc.html

  * igt@prime_vgem@basic-fence-flip:
    - bat-adlm-1:         NOTRUN -> [SKIP][8] ([i915#3708] / [i915#9900])
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_129191v1/bat-adlm-1/igt@prime_vgem@basic-fence-flip.html

  * igt@prime_vgem@basic-write:
    - bat-adlm-1:         NOTRUN -> [SKIP][9] ([i915#3708]) +2 other tests skip
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_129191v1/bat-adlm-1/igt@prime_vgem@basic-write.html

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

  [fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
  [i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
  [i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
  [i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
  [i915#4342]: https://gitlab.freedesktop.org/drm/intel/issues/4342
  [i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
  [i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
  [i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
  [i915#9673]: https://gitlab.freedesktop.org/drm/intel/issues/9673
  [i915#9732]: https://gitlab.freedesktop.org/drm/intel/issues/9732
  [i915#9875]: https://gitlab.freedesktop.org/drm/intel/issues/9875
  [i915#9900]: https://gitlab.freedesktop.org/drm/intel/issues/9900


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

  * Linux: CI_DRM_14181 -> Patchwork_129191v1

  CI-20190529: 20190529
  CI_DRM_14181: 6aa961ab469df8db84bee01a55606a91a6ae5d67 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_7693: f5f774ada63296536195fd381d8720f5ac7e2208 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  Patchwork_129191v1: 6aa961ab469df8db84bee01a55606a91a6ae5d67 @ git://anongit.freedesktop.org/gfx-ci/linux


### Linux commits

8c8742f3f28c drm/i915: update eDP MSO pipe mask for newer platforms

== Logs ==

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

[-- Attachment #2: Type: text/html, Size: 5896 bytes --]