drm/i915: Remove non-existent pipes from bigjoiner pipe mask
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 18 Nov 2022 18:52:01 +0000 (20:52 +0200)
committerTvrtko Ursulin <tvrtko.ursulin@intel.com>
Tue, 29 Nov 2022 08:49:15 +0000 (08:49 +0000)
bigjoiner_pipes() doesn't consider that:
- RKL only has three pipes
- some pipes may be fused off

This means that intel_atomic_check_bigjoiner() won't reject
all configurations that would need a non-existent pipe.
Instead we just keep on rolling witout actually having
reserved the slave pipe we need.

It's possible that we don't outright explode anywhere due to
this since eg. for_each_intel_crtc_in_pipe_mask() will only
walk the crtcs we've registered even though the passed in
pipe_mask asks for more of them. But clearly the thing won't
do what is expected of it when the required pipes are not
present.

Fix the problem by consulting the device info pipe_mask already
in bigjoiner_pipes().

Cc: stable@vger.kernel.org
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221118185201.10469-1-ville.syrjala@linux.intel.com
Reviewed-by: Arun R Murthy <arun.r.murthy@intel.com>
(cherry picked from commit f1c87a94a1087a26f41007ee83264033007421b5)
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
drivers/gpu/drm/i915/display/intel_display.c

index 461c62c884133a567a8ee1d6e67d6deb60d0ed64..de77054195c6812652e5cad596af6cd9f6e63f45 100644 (file)
@@ -3723,12 +3723,16 @@ out:
 
 static u8 bigjoiner_pipes(struct drm_i915_private *i915)
 {
+       u8 pipes;
+
        if (DISPLAY_VER(i915) >= 12)
-               return BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D);
+               pipes = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D);
        else if (DISPLAY_VER(i915) >= 11)
-               return BIT(PIPE_B) | BIT(PIPE_C);
+               pipes = BIT(PIPE_B) | BIT(PIPE_C);
        else
-               return 0;
+               pipes = 0;
+
+       return pipes & RUNTIME_INFO(i915)->pipe_mask;
 }
 
 static bool transcoder_ddi_func_is_enabled(struct drm_i915_private *dev_priv,