Hi, as far as I can tell the change is already included in 5.15-stable tree https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/gpu/drm/i915?h=v5.15.99&id=c919e1154b8c25d0da7b45655f6026761dcef5c6 not sure how it has ended up to being applied again. Same thing for conflicts in stable trees 5.10, 6.1 and 6.2. Best regards, Mikko > -----Original Message----- > From: gregkh@xxxxxxxxxxxxxxxxxxx <gregkh@xxxxxxxxxxxxxxxxxxx> > Sent: perjantai 10. maaliskuuta 2023 13.38 > To: Mikko Kovanen <mikko.kovanen@xxxxxxxxxxxxxx>; > jani.nikula@xxxxxxxxx > Cc: stable@xxxxxxxxxxxxxxx > Subject: FAILED: patch "[PATCH] drm/i915/dsi: fix VBT send packet port > selection for dual" failed to apply to 5.15-stable tree > > > The patch below does not apply to the 5.15-stable tree. > If someone wants it applied there, or to any other stable or longterm tree, > then please email the backport, including the original git commit id to > <stable@xxxxxxxxxxxxxxx>. > > To reproduce the conflict and resubmit, you may use the following > commands: > > git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ > linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x > 8d58bb7991c45f6b60710cc04c9498c6ea96db90 > # <resolve conflicts, build, test, etc.> git commit -s git send-email --to > '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '167844825562231@xxxxxxxxx' -- > subject-prefix 'PATCH 5.15.y' HEAD^.. > > Possible dependencies: > > 8d58bb7991c4 ("drm/i915/dsi: fix VBT send packet port selection for dual link > DSI") > 08c59dde71b7 ("drm/i915/dsi: fix VBT send packet port selection for ICL+") > > thanks, > > greg k-h > > ------------------ original commit in Linus's tree ------------------ > > From 8d58bb7991c45f6b60710cc04c9498c6ea96db90 Mon Sep 17 00:00:00 > 2001 > From: Mikko Kovanen <mikko.kovanen@xxxxxxxxxxxxxx> > Date: Sat, 26 Nov 2022 13:27:13 +0000 > Subject: [PATCH] drm/i915/dsi: fix VBT send packet port selection for dual > link DSI > > intel_dsi->ports contains bitmask of enabled ports and correspondingly logic > for selecting port for VBT packet sending must use port specific bitmask > when deciding appropriate port. > > Fixes: 08c59dde71b7 ("drm/i915/dsi: fix VBT send packet port selection for > ICL+") > Cc: stable@xxxxxxxxxxxxxxx > Signed-off-by: Mikko Kovanen <mikko.kovanen@xxxxxxxxxxxxxx> > Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx> > Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> > Link: > https://patchwork.freedesktop.org/patch/msgid/DBBPR09MB466592B16885 > D99ABBF2393A91119@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > > diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c > b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c > index 75e8cc4337c9..fce69fa446d5 100644 > --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c > +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c > @@ -137,9 +137,9 @@ static enum port intel_dsi_seq_port_to_port(struct > intel_dsi *intel_dsi, > return ffs(intel_dsi->ports) - 1; > > if (seq_port) { > - if (intel_dsi->ports & PORT_B) > + if (intel_dsi->ports & BIT(PORT_B)) > return PORT_B; > - else if (intel_dsi->ports & PORT_C) > + else if (intel_dsi->ports & BIT(PORT_C)) > return PORT_C; > } >
