From: Greg Kroah-Hartman Date: Thu, 6 Jun 2024 12:55:53 +0000 (+0200) Subject: drop 4.19 patch that didn't apply X-Git-Tag: v6.1.93~35 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd1d592297c0b54bac7defd000e40e884f6b10db;p=thirdparty%2Fkernel%2Fstable-queue.git drop 4.19 patch that didn't apply --- diff --git a/queue-4.19/drm-msm-dpu-always-flush-the-slave-intf-on-the-ctl.patch b/queue-4.19/drm-msm-dpu-always-flush-the-slave-intf-on-the-ctl.patch deleted file mode 100644 index 4f49ca06e21..00000000000 --- a/queue-4.19/drm-msm-dpu-always-flush-the-slave-intf-on-the-ctl.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a0c0ee1edbbc73e4397621e0026af5b9482ac09a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 17 Apr 2024 01:57:43 +0200 -Subject: drm/msm/dpu: Always flush the slave INTF on the CTL - -From: Marijn Suijten - -[ Upstream commit 2b938c3ab0a69ec6ea587bbf6fc2aec3db4a8736 ] - -As we can clearly see in a downstream kernel [1], flushing the slave INTF -is skipped /only if/ the PPSPLIT topology is active. - -However, when DPU was originally submitted to mainline PPSPLIT was no -longer part of it (seems to have been ripped out before submission), but -this clause was incorrectly ported from the original SDE driver. Given -that there is no support for PPSPLIT (currently), flushing the slave -INTF should /never/ be skipped (as the `if (ppsplit && !master) goto -skip;` clause downstream never becomes true). - -[1]: https://git.codelinaro.org/clo/la/platform/vendor/opensource/display-drivers/-/blob/display-kernel.lnx.5.4.r1-rel/msm/sde/sde_encoder_phys_cmd.c?ref_type=heads#L1131-1139 - -Fixes: 25fdd5933e4c ("drm/msm: Add SDM845 DPU support") -Signed-off-by: Marijn Suijten -Reviewed-by: Dmitry Baryshkov -Patchwork: https://patchwork.freedesktop.org/patch/589901/ -Link: https://lore.kernel.org/r/20240417-drm-msm-initial-dualpipe-dsc-fixes-v1-3-78ae3ee9a697@somainline.org -Signed-off-by: Dmitry Baryshkov -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c -index f2aa62bae8bfd..4f5700155383e 100644 ---- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c -+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c -@@ -514,9 +514,6 @@ static void dpu_encoder_phys_cmd_enable_helper( - - _dpu_encoder_phys_cmd_pingpong_config(phys_enc); - -- if (!dpu_encoder_phys_cmd_is_master(phys_enc)) -- return; -- - ctl = phys_enc->hw_ctl; - ctl->ops.get_bitmask_intf(ctl, &flush_mask, phys_enc->intf_idx); - ctl->ops.update_pending_flush(ctl, flush_mask); --- -2.43.0 - diff --git a/queue-4.19/series b/queue-4.19/series index 836536a9bc2..651b558b8d0 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -109,7 +109,6 @@ libsubcmd-fix-parse-options-memory-leak.patch input-ims-pcu-fix-printf-string-overflow.patch input-pm8xxx-vibrator-correct-vib_max_levels-calcula.patch drm-msm-dpu-use-kms-stored-hw-mdp-block.patch -drm-msm-dpu-always-flush-the-slave-intf-on-the-ctl.patch um-fix-return-value-in-ubd_init.patch um-add-winch-to-winch_handlers-before-registering-wi.patch media-stk1160-fix-bounds-checking-in-stk1160_copy_vi.patch