Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/i915/dsi: fix VBT send packet port selection for dual" failed to apply to 5.15-stable tree

PATCH [email protected] 2 participants 2 messages Mar 10, 2023

Subsystems (4)
Stable branch DRM drivers Intel i915 Intel DRM display for xe and i915 drivers
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

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 <[email protected]>.

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 '<[email protected]>' --in-reply-to '[email protected]' --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 <[email protected]>
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 [email protected]
Signed-off-by Mikko Kovanen <[email protected]>
Reviewed-by Jani Nikula <[email protected]>
Signed-off-by Jani Nikula <[email protected]>
Link https://patchwork.freedesktop.org/patch/msgid/DBBPR09MB466592B16885D99ABBF2393A91119@DBBPR09MB4665.eurprd09.prod.outlook.com
drivers/gpu/drm/i915/display/intel_dsi_vbt.c +2 -2
index 75e8cc4337c9..fce69fa446d5 100644
@@ -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;
 	}
#1 lore raw

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

Quoted 76 lines

-----Original Message-----
From: [email protected] <[email protected]>
Sent: perjantai 10. maaliskuuta 2023 13.38
To: Mikko Kovanen <[email protected]>; [email protected]
Cc: [email protected]
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 <[email protected]>.

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 '<[email protected]>' --in-reply-to '[email protected]' -- 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 <[email protected]>
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 [email protected]
Signed-off-by Mikko Kovanen <[email protected]>
Reviewed-by Jani Nikula <[email protected]>
Signed-off-by Jani Nikula <[email protected]>

Link:
https://patchwork.freedesktop.org/patch/msgid/DBBPR09MB466592B16885
[email protected]

drivers/gpu/drm/i915/display/intel_dsi_vbt.c +2 -2
index 75e8cc4337c9..fce69fa446d5 100644
@@ -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;
 	}