From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794064306; b=fJTQnjZbyhgeVDRr+7JsJIfGb29HvMxoP62Jwm4PK+I0NLVfz/fK9hNaY5u1S0zbJSjH n4yqFB9PqRV3X/yc1l6itER//yQgBXM+XSiuiKL4hy55adslI2oimW6JworyFbmn32MlJ lrdXMNa7/MpJKTlfneRkFKm4c6LGZWh8HmZwRKj5q16Os+nAoIxHrhIBcUqmBNrXhrPMx CCePnq09UPkQMG0Kayf71UwBbzYyOtHnQRJ9uj70YerSHnPGe92cRZ2HjPQskt73B/j4p DIF1zBwFMkZOVyXtnELuI+BcVoMSihRU+bN8DPVcTQJZSebnGHplS12qYpxYyOuURDg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794064306; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=J1VEWOaz+nui8ONRR1DPvAI9h8BLlyC/1HMK8TpKfMw=; b=ZSme/q8VucYwmIwImIKUydgOwZ+/AKT4L7nDQ9pfHqvEBQU4zev29jvGteFdS9OwkqcK V0nCtaZjP12FcMAp4IS79BjWK88nYLy4t5nUoIXp3jwPZSSXDP4d89A1FhqDNAK4iO02E iyesxmzVUtTNHd5lE9WsBU/gw9y3nXPsjysBouzzu0Nvi9T4F7kVXmAzOSlE46/5+YqsN iZtbR2tYyhgPNJ6+RtzLNeL4swVEse3tvbagkRXbl0YQi9+XCDRH3Zja2jIoNkKPGOXd0 MDX4kImrcoSwVKU2PBTGZg/CinltlHoR0o3lTqxP0SG8plKWN6L30kqkTSbQd37ogmA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=oBh9HizT; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D2793606A9CC; Sat, 7 Nov 2026 15:11:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=oBh9HizT Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7D9361F0089F; Sat, 7 Nov 2026 15:11:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794064305; bh=J1VEWOaz+nui8ONRR1DPvAI9h8BLlyC/1HMK8TpKfMw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oBh9HizTy3vo6L+8JDfpU8olgUav/q1rzFmKmgNi57pSqRpEq7CJX3NJliapmidr9 UYmi5gMj/NpQ4SASi2w36Tj9C0nBZbHoFfObZDUm/TG+rOSKgkH8/X/hoN3+L3zIP1 gskv6QFE/V5NzyofoJ62cijBGzpWmC5htMMKmnqQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Krzysztof Kozlowski , Dmitry Baryshkov , Sasha Levin Subject: [PATCH 7.3 0397/1257] drm/msm/hdmi: Handle msm_hdmi_power_on() errors during .atomic_pre_enable() Date: Sat, 7 Nov 2026 08:44:53 -0500 Message-ID: <20261107134950.507964638@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261107134939.434104957@linuxfoundation.org> References: <20261107134939.434104957@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.3-stable review patch. If anyone has any objections, please let me know. ------------------ From: Krzysztof Kozlowski [ Upstream commit dd6ecace57851878e62367a6f1a26dd5b9aa217f ] Properly handle power up failures during .atomic_pre_enable() by aborting the .atomic_pre_enable() to avoid accessing registers why blocks did not bring up. Otherwise this could lead to imprecise aborts when accessing MMIO while entire power domain is off. Cc: Fixes: ba3d7bf3a7ab ("drm/msm/hdmi: Convert PHY files according to new design") Signed-off-by: Krzysztof Kozlowski Reviewed-by: Dmitry Baryshkov Patchwork: https://patchwork.freedesktop.org/patch/752652/ Link: https://lore.kernel.org/r/20260911-drm-msm-hdmi-fixes-before-eliza-v4-2-87bdb9f1987f@oss.qualcomm.com Signed-off-by: Dmitry Baryshkov Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 30 ++++++++++++++++++-------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c index 157f19bd90b4e..db85400e574e4 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c @@ -13,14 +13,16 @@ #include "msm_kms.h" #include "hdmi.h" -static void msm_hdmi_power_on(struct drm_bridge *bridge) +static int msm_hdmi_power_on(struct drm_bridge *bridge) { struct drm_device *dev = bridge->dev; struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge); struct hdmi *hdmi = hdmi_bridge->hdmi; int ret; - pm_runtime_resume_and_get(&hdmi->pdev->dev); + ret = pm_runtime_resume_and_get(&hdmi->pdev->dev); + if (ret) + return ret; if (hdmi->extp_clk) { DBG("pixclock: %lu", hdmi->pixclock); @@ -29,9 +31,14 @@ static void msm_hdmi_power_on(struct drm_bridge *bridge) DRM_DEV_ERROR(dev->dev, "failed to set extp clk rate: %d\n", ret); ret = clk_prepare_enable(hdmi->extp_clk); - if (ret) + if (ret) { DRM_DEV_ERROR(dev->dev, "failed to enable extp clk: %d\n", ret); + pm_runtime_put(&hdmi->pdev->dev); + return ret; + } } + + return 0; } static void power_off(struct drm_bridge *bridge) @@ -287,13 +294,18 @@ static void msm_hdmi_bridge_atomic_pre_enable(struct drm_bridge *bridge, msm_hdmi_set_timings(hdmi, &crtc_state->adjusted_mode); - mutex_lock(&hdmi->state_mutex); - if (!hdmi->power_on) { - msm_hdmi_phy_resource_enable(phy); - msm_hdmi_power_on(bridge); - hdmi->power_on = true; + scoped_guard(mutex, &hdmi->state_mutex) { + if (!hdmi->power_on) { + if (msm_hdmi_phy_resource_enable(phy)) + return; + + if (msm_hdmi_power_on(bridge)) { + msm_hdmi_phy_resource_disable(phy); + return; + } + hdmi->power_on = true; + } } - mutex_unlock(&hdmi->state_mutex); if (connector->display_info.is_hdmi) msm_hdmi_audio_update(hdmi); -- 2.53.0