From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AA12B431E50 for ; Tue, 7 Jul 2026 17:52:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783446740; cv=none; b=LIX+KtMh//hWBL8ajIX2i7HfZJDPCFCqC7Hk6DyG3Ufp9HD/WoZO3NXLEej26SxA62LhF9vthNRK2rufVsTjvUoa8Rf96zWHjqJBGY8C7nQXYdZj3+WMmtl7bbAiJGIc8k78D3ZAqqtvkqZL3DXZxwyUEncZ+ZXJ57D4ZvZqp1g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783446740; c=relaxed/simple; bh=PLTpZ2uaKIACZG1itnN1nSrxyn8t2NhexmU83EALikE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Zx+utHF7ijxa1J0kXVKdBHcXTZNzxaIEUFH+C21Pn17mpDVpKRwFxyiw2YUJCZPiz+/KTkoqkUdOYFB3SKiDCTRxQI3bIu/7eTSSQ26faKvniupno5V6mCEt8WkNjrgdYXy8To737sPDJeyXvbB8CF2DLyyu/gHu07nwCvuujCs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PcBVRQ3a; arc=none smtp.client-ip=209.85.222.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PcBVRQ3a" Received: by mail-qk1-f174.google.com with SMTP id af79cd13be357-92e54f8c051so217589185a.3 for ; Tue, 07 Jul 2026 10:52:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783446739; x=1784051539; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=dKpLi/aSU1pvIw+0U5MiuZ/Ta5E2utuxKfUPqmuk/fY=; b=PcBVRQ3aHn5sjSYllmYwXvZ1jrXneyCRHhKi11sV/dDHUHiDhFKs4dNbs3EEraS+th 594eHPUwoUKnr0j78irPPP51+hrntQteNAk1fE9FwEoXPOCqpDd41Wro+Xoks+GUZPqO nrjZSlwixgo2gQQyS0aWWgM7PHIEhWZ4e/UMRK8XrA1LEmhJ4kmcDcJ6Y8AFGBNDm9fM fmFrf53+SOYCzxiyFhatgj2YvUjSVflhDBf82Ao85ZlRTY6gkDks0YYRrizAYXL6RlyA yn4jsgGoHE66rG69cWOZEBHDUdgCWPYTvCEjHcJyFNVNX02AsyzGueu9DwrYS9jdeU9s i35Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783446739; x=1784051539; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=dKpLi/aSU1pvIw+0U5MiuZ/Ta5E2utuxKfUPqmuk/fY=; b=iLOwTKInDcvyBtGpDdykFFFnhgZ/HPsa7psovTSrG6vzo0bKr35AYRSvMnGmziIp6I PM+VkB7JHxrtpXMHsYeZ4N/LRxxFBrtfxPSv6ZD3EbJFLy1rDYf6il7lEtj4IWECcwg9 tN3qpp/qE1+jdiRji4Rhny7hH9kMRC4I+TuwPcTNLVZ9AJ+7DaloIeUil0UNhHjNXaQw hS53IO6xab+sYvh97BFOtR5czmGJs7gzy1cxxVjcbr51PuUXZUwqXLc5AuVO8PV/pQir zhuJCSymRgF3ucPsiNH2ixmAkVSvA/oNzvvcqqe2IEA82Nuu3xO0xAh3MP++SiGmLCJC Lh9w== X-Forwarded-Encrypted: i=1; AHgh+Ro7+d1BvDXFpPzqfGVfJU1hH+Tv5cBPZYgofixZKVDeZhZh4mzRW23SbrKyH4CCazDFQuNAhADHSdS0Qxo=@vger.kernel.org X-Gm-Message-State: AOJu0YwRIX263qCtkDe+T6hqKDHRQAlwaLEtgxz/pUb1B7tkR8bmHr8C P5Ky/j65NlTMe6dlWzRyLaZD6HDiXcZMjFa8tSKnXP95kR6NghEmnjCO X-Gm-Gg: AfdE7cn2tk5ajHXNhhlcaGCdQli301msAet42ycJcgEJZVpAxNQs2T/ceRDgFRTEisr f1u+HIDzh72EPZSdJ9+XwVrHUUF6hAG1Oqc3fnjF1Aw6F1tsWb2pLq6+cTL8xNHwXRNE0N0G3rc otXfCXzScAqpGcFJuZW5SoMGYPPAXVb2thO8OymNnpMC1DqreCq6KdirwBMliswgFGP8cUvdFR+ SSRd/mXrU8FQzwiwwxkLOpU56WTHbDe53O0Z49fRr1idVwY78KDJ9klICM8NaWRaQ75/X42ns8U 2AO24C+QtJRnBZtKyOPzR6jtugaVL4y37gAL5ixhIHxDadRWMrGkCoCC/orAPAInmm6Oxt/54ez XNbuYO4Q4xIKRdFGuY0azFv1OnU+TKN4t6f1mOLvne1H4CtGG9cnF5abfpd/L4G8mb9bzUfY/n3 MaXtPaClcMtuxC8kc6E7Po+kJGI7lJP8jnBCDYvY+k3gjVZirdpQ4HHxTd1c3BF0/ifDM944KL/ MbVRdDlE05K4Wc= X-Received: by 2002:a05:620a:a803:b0:92e:bd6f:b166 with SMTP id af79cd13be357-92ebd6fb78bmr488673385a.63.1783446738390; Tue, 07 Jul 2026 10:52:18 -0700 (PDT) Received: from i4-gl-tmk5904.ad.psu.edu ([130.203.156.186]) by smtp.gmail.com with ESMTPSA id af79cd13be357-92e90cfdefasm1229880085a.47.2026.07.07.10.52.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2026 10:52:17 -0700 (PDT) From: Yuho Choi To: Rob Clark , Dmitry Baryshkov , David Airlie , Simona Vetter Cc: Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , Vladimir Oltean , Kees Cook , Dale Whinham , Nathan Chancellor , Xiangxu Yin , Kuogee Hsieh , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Yuho Choi Subject: [PATCH v1] drm/msm/dp: Disable stream clock after video-ready timeout Date: Tue, 7 Jul 2026 13:52:12 -0400 Message-ID: <20260707175212.412699-1-dbgh9129@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit msm_dp_ctrl_on_stream() enables the stream pixel clock before waiting for video readiness. If that wait times out, it returns without disabling the clock or clearing stream_clks_on. Route the timeout path through cleanup and disable the clock only if this call enabled it. Fixes: 9bd0946d5ca1 ("drm/msm/dp: simplify stream clocks handling") Signed-off-by: Yuho Choi --- drivers/gpu/drm/msm/dp/dp_ctrl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.c b/drivers/gpu/drm/msm/dp/dp_ctrl.c index 86ef8c89ad44..139e9fa25d6a 100644 --- a/drivers/gpu/drm/msm/dp/dp_ctrl.c +++ b/drivers/gpu/drm/msm/dp/dp_ctrl.c @@ -2469,6 +2469,7 @@ int msm_dp_ctrl_on_stream(struct msm_dp_ctrl *msm_dp_ctrl, bool force_link_train { int ret = 0; bool mainlink_ready = false; + bool stream_clk_enabled = false; struct msm_dp_ctrl_private *ctrl; unsigned long pixel_rate; unsigned long pixel_rate_orig; @@ -2514,6 +2515,7 @@ int msm_dp_ctrl_on_stream(struct msm_dp_ctrl *msm_dp_ctrl, bool force_link_train goto end; } ctrl->stream_clks_on = true; + stream_clk_enabled = true; } if (force_link_train || !msm_dp_ctrl_channel_eq_ok(ctrl)) @@ -2543,13 +2545,17 @@ int msm_dp_ctrl_on_stream(struct msm_dp_ctrl *msm_dp_ctrl, bool force_link_train ret = msm_dp_ctrl_wait4video_ready(ctrl); if (ret) - return ret; + goto end; mainlink_ready = msm_dp_ctrl_mainlink_ready(ctrl); drm_dbg_dp(ctrl->drm_dev, "mainlink %s\n", mainlink_ready ? "READY" : "NOT READY"); end: + if (stream_clk_enabled && ret) { + clk_disable_unprepare(ctrl->pixel_clk); + ctrl->stream_clks_on = false; + } return ret; } -- 2.43.0