From f71fe837579cd3e44ab35df45abf7e9526718796 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 3 Dec 2022 18:02:57 +0100 Subject: [PATCH] drop queue-6.0/drm-i915-remove-non-existent-pipes-from-bigjoiner-pipe-mask.patch --- ...stent-pipes-from-bigjoiner-pipe-mask.patch | 64 ------------------- queue-6.0/series | 1 - 2 files changed, 65 deletions(-) delete mode 100644 queue-6.0/drm-i915-remove-non-existent-pipes-from-bigjoiner-pipe-mask.patch diff --git a/queue-6.0/drm-i915-remove-non-existent-pipes-from-bigjoiner-pipe-mask.patch b/queue-6.0/drm-i915-remove-non-existent-pipes-from-bigjoiner-pipe-mask.patch deleted file mode 100644 index 35067f8eb92..00000000000 --- a/queue-6.0/drm-i915-remove-non-existent-pipes-from-bigjoiner-pipe-mask.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 3c1ea6a5f4f55d4e376675dda16945eb5d9bb4de Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= -Date: Fri, 18 Nov 2022 20:52:01 +0200 -Subject: drm/i915: Remove non-existent pipes from bigjoiner pipe mask -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Ville Syrjälä - -commit 3c1ea6a5f4f55d4e376675dda16945eb5d9bb4de upstream. - -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ä -Link: https://patchwork.freedesktop.org/patch/msgid/20221118185201.10469-1-ville.syrjala@linux.intel.com -Reviewed-by: Arun R Murthy -(cherry picked from commit f1c87a94a1087a26f41007ee83264033007421b5) -Signed-off-by: Tvrtko Ursulin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/i915/display/intel_display.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - ---- a/drivers/gpu/drm/i915/display/intel_display.c -+++ b/drivers/gpu/drm/i915/display/intel_display.c -@@ -3717,12 +3717,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, diff --git a/queue-6.0/series b/queue-6.0/series index 81ce2ca1c98..f481cf3a73a 100644 --- a/queue-6.0/series +++ b/queue-6.0/series @@ -93,7 +93,6 @@ mmc-sdhci-fix-voltage-switch-delay.patch kconfig.debug-provide-a-little-extra-frame_warn-leeway-when-kasan-is-enabled.patch drm-amdgpu-temporarily-disable-broken-clang-builds-due-to-blown-stack-frame.patch drm-amdgpu-enable-vangogh-vcn-indirect-sram-mode.patch -drm-i915-remove-non-existent-pipes-from-bigjoiner-pipe-mask.patch drm-i915-fix-negative-value-passed-as-remaining-time.patch drm-i915-never-return-0-if-not-all-requests-retired.patch tracing-osnoise-fix-duration-type.patch -- 2.47.3