From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19722C6FD1E for ; Fri, 10 Mar 2023 11:38:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230420AbjCJLiN (ORCPT ); Fri, 10 Mar 2023 06:38:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230094AbjCJLh4 (ORCPT ); Fri, 10 Mar 2023 06:37:56 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 583EC10F6 for ; Fri, 10 Mar 2023 03:37:54 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id CF057B82266 for ; Fri, 10 Mar 2023 11:37:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2AAF5C433EF; Fri, 10 Mar 2023 11:37:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678448271; bh=rE0qOSF3/Vx+1KNhtyUVRLD+yXxoCI9N4ByWCL9w3MY=; h=Subject:To:Cc:From:Date:From; b=cf//gUBT60WA6LErq7S7lVEGpbrZHmA5ApNDFxMANaf0I7C2zHAYaAvLiKsAADb1q ycIeV0KgqELJGmcHmhUL8n5EWDUHMKOpk1pD7I8CVMtkZYfFjm4SokcrJH69hZZSdZ 4/WchzTzSzho/8DXw2AATxoBWUi7u4155c87lIzY= Subject: FAILED: patch "[PATCH] drm/i915/dsi: fix VBT send packet port selection for dual" failed to apply to 5.10-stable tree To: mikko.kovanen@aavamobile.com, jani.nikula@intel.com Cc: From: Date: Fri, 10 Mar 2023 12:37:36 +0100 Message-ID: <167844825645110@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 5.10-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 . 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.10.y git checkout FETCH_HEAD git cherry-pick -x 8d58bb7991c45f6b60710cc04c9498c6ea96db90 # git commit -s git send-email --to '' --in-reply-to '167844825645110@kroah.com' --subject-prefix 'PATCH 5.10.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 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@vger.kernel.org Signed-off-by: Mikko Kovanen Reviewed-by: Jani Nikula Signed-off-by: Jani Nikula Link: https://patchwork.freedesktop.org/patch/msgid/DBBPR09MB466592B16885D99ABBF2393A91119@DBBPR09MB4665.eurprd09.prod.outlook.com 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; }