From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ACD64248F4B for ; Mon, 30 Jun 2025 11:23:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751282622; cv=none; b=u78KQT8ALX4BzlqXvuCY+eZ27bm3CSkvOFu8scGpleJrcjXrOee26YCmgNSFn614kQZoENwSqIkwjO8+Ngm6K3OtjDkPGHw2+L9AyTQgiE5TObr6YWe1hqWxNS7nNG+XXP2CEcgSYttFAP71SCeI/Ta2J+0ERfRHZvlOHJR6tvY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751282622; c=relaxed/simple; bh=Yk7vpWz96v3b4lSzXoJd2RczLB31AP6h25drqqG00YY=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=AulXHoqN4n/SXw9XiwVTDgHUgreJDon6PiiHVaIDEgP/rNXMxneFNQcyZfrFpY8s8IAj9l83Ti/jBmdGRb6t/SIbxxipQE6gRE/DegdTmLkNTMrVVZFT4rrM++YyIbadORUOV0O5Ak0pNRsbH3azBxuP8wsniYbjSqmOlrbWVPQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=FbkVAbK/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="FbkVAbK/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00E2CC4CEE3; Mon, 30 Jun 2025 11:23:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1751282622; bh=Yk7vpWz96v3b4lSzXoJd2RczLB31AP6h25drqqG00YY=; h=Subject:To:Cc:From:Date:From; b=FbkVAbK/TBfbaCfnfacq395swg25yQ2i1A4g10f2VWEAooxDA3HQkiISaYL7/dUK8 c69oZ6/oZzWcROiYubF00OOEqyMSB5nWlX2tscNNR3/Z/86bmod/7SJtQz3ohwzMBE 1MxFE4xozPtQNN8KJLev7rQqYWoCF7cKh805W45Y= Subject: FAILED: patch "[PATCH] drm/bridge: cdns-dsi: Fix phy de-init and flag it so" failed to apply to 5.15-stable tree To: a-bhatia1@ti.com,aradhya.bhatia@linux.dev,dmitry.baryshkov@linaro.org,dmitry.baryshkov@oss.qualcomm.com,tomi.valkeinen@ideasonboard.com Cc: From: Date: Mon, 30 Jun 2025 13:23:39 +0200 Message-ID: <2025063039-tidiness-cuddly-578d@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit 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 . 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 fd2611c13f69cbbc6b81d9fc7502abf4f7031d21 # git commit -s git send-email --to '' --in-reply-to '2025063039-tidiness-cuddly-578d@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From fd2611c13f69cbbc6b81d9fc7502abf4f7031d21 Mon Sep 17 00:00:00 2001 From: Aradhya Bhatia Date: Sat, 29 Mar 2025 17:09:13 +0530 Subject: [PATCH] drm/bridge: cdns-dsi: Fix phy de-init and flag it so The driver code doesn't have a Phy de-initialization path as yet, and so it does not clear the phy_initialized flag while suspending. This is a problem because after resume the driver looks at this flag to determine if a Phy re-initialization is required or not. It is in fact required because the hardware is resuming from a suspend, but the driver does not carry out any re-initialization causing the D-Phy to not work at all. Call the counterparts of phy_init() and phy_power_on(), that are phy_exit() and phy_power_off(), from _bridge_post_disable(), and clear the flags so that the Phy can be initialized again when required. Fixes: fced5a364dee ("drm/bridge: cdns: Convert to phy framework") Cc: stable@vger.kernel.org Reviewed-by: Dmitry Baryshkov Reviewed-by: Tomi Valkeinen Tested-by: Tomi Valkeinen Signed-off-by: Aradhya Bhatia Signed-off-by: Aradhya Bhatia Link: https://lore.kernel.org/r/20250329113925.68204-3-aradhya.bhatia@linux.dev Signed-off-by: Dmitry Baryshkov diff --git a/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c b/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c index 1cfe17865b06..3b15528713fe 100644 --- a/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c +++ b/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c @@ -683,6 +683,11 @@ static void cdns_dsi_bridge_atomic_post_disable(struct drm_bridge *bridge, struct cdns_dsi_input *input = bridge_to_cdns_dsi_input(bridge); struct cdns_dsi *dsi = input_to_dsi(input); + dsi->phy_initialized = false; + dsi->link_initialized = false; + phy_power_off(dsi->dphy); + phy_exit(dsi->dphy); + pm_runtime_put(dsi->base.dev); } @@ -1166,7 +1171,6 @@ static int __maybe_unused cdns_dsi_suspend(struct device *dev) clk_disable_unprepare(dsi->dsi_sys_clk); clk_disable_unprepare(dsi->dsi_p_clk); reset_control_assert(dsi->dsi_p_rst); - dsi->link_initialized = false; return 0; }