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=1794063064; b=lSoKUNI8A0o9nWiVpXIPH8I7A5AzVJ405nP+MoxVhTvsZegLc9fyglcY2Tx6AkwV58Mn 9z2L1W8vLlYATQYny6hbKRQj+Ux412Ei9qIqmYXTTnqXoEKfTFJC+VVDdS5g1zoEdl/H+ gOF1UEAQhH7VlDp3eddD+vYkdJLXKB8aXj3J3CwkLOp2war+xB/6Wqq6ln0IAkYN06std NSP3tsL/xJ+RZ7eCfbtRnL/2MK7DHYKNuVenzZ99R5qBHiBlmwapQVvuIQv7yrpuwZEaR yyHJrjO6ygsgjM0gVNtQN0z3GbslUnmgVuD9oK4Uy35+RRRpmZ4LOCMEmG9puD0g0bQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794063064; 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=pUcOUBqdMITDj4GUwjdS/uSCYWmHDCHa3fGrrvAXtQE=; b=p+4HksnYhnuBzlgcT4gj35s2LpJcBbA4OFz7A8b2YwSP7M9t7JlK+FrT3HLqor9E+4XR O8z+3UmjvIOOm6Hob7ASuuxgXl9/kXNViUtk3SnllCReo25GA0/j9AOuNVaxs9DpQCDYc OnG8KI0d/xilwYwvkUoRvkTszDFKh+5jXK30TE4YebhQfjvJGKT9qYS9p4+kUIsjOmQbB xMnxBTziaE9cPME1nm8QZ1V3VqvZb+8BkK6tYnP1rOC8LFmw1JrTP0iyJ4t8QXDeTSNsC f83IfFwN4bxP/CBKxPBLivGMeNYt+S1ujQnTZ6xaa1AC5iAB7m18nqhZPGAcAlvqW+g== 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=Z1oXkdSo; 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 24DC6606D80E; Sat, 7 Nov 2026 14:51:04 +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=Z1oXkdSo Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6E9F1F0089F; Sat, 7 Nov 2026 14:51:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794063064; bh=pUcOUBqdMITDj4GUwjdS/uSCYWmHDCHa3fGrrvAXtQE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Z1oXkdSo4qICpLbcWK9Es83r8nU55pP0f4W3P9LUIANkovRzKFiWoXVX0bLxsavtA x3toOaR5rkdVrmvwFxb2z2qYEJAac9G/fpKb9r4yb+YtjQOFpqshxDdaDp+lHOoY55 Y8gC7H2ZD+6M8ayzgCbcvfWDYnbRGCy2OkMaVAwY= 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 6.18 305/869] drm/msm/hdmi: Handle msm_hdmi_power_on() errors during .atomic_pre_enable() Date: Sat, 7 Nov 2026 08:49:47 -0500 Message-ID: <20261107134902.892765108@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261107134852.069646174@linuxfoundation.org> References: <20261107134852.069646174@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 6.18-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 93a491a103e0a..45bc4db5f66cd 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) @@ -302,13 +309,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