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 AA088431E4F 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=1783446741; cv=none; b=r3IkzdBAeZq5DKW2CRgyBVnCARYfLT4R4hiNDkQXH3EOlHQKpLVJ438HB6TqS4LQPSRIiMDM+Mdypkvw29f7tJparU3hOecCtv+ziRD+5ZYXStGfSIBzf7CbEeADdipD3+G6bf9DkDD6kB397IW/UmgM/rpzsaIBXqMH+AKaQ4I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783446741; c=relaxed/simple; bh=PLTpZ2uaKIACZG1itnN1nSrxyn8t2NhexmU83EALikE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=c+2320L/wJCule6SptmKG/HLGsDLje2wd+lWWup36rB2HggpoWlKFs/KoOklaY0DaKp+mHwbmNSG2YLe/yuUXmO5vf3m35SVhI/8V77x3zGaS11tEjQuweWz8efqewphDW4cgEGtwnTxAZzcVoLA3AbSocQ4+vokYudUywjnJwU= 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-92e99ef0902so190316085a.2 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=R3XGjC4fMNIdfIs+3T3+jDWKRst4njB31PJayIPV0h/bVk+7N4dCSgVV3URPa5C0q8 bPsoGrUdAZNCgEHp9V/7aeRbYbku2ZhkiqjIjxthsDEmVAZem3U8QMF7+X2hGEr7RIjB 7Wo+m3//hpOiMOTfsLZogCZTbQwQn5q7flh9fTioEF5Y/l7ENHzrqlXH+lhfQdySM58E UybRVklqZl0uwA2rNn439ioSlnfOB/aDq1/YNCabgN5e8BzLgF1CB0uHUV2jcQ5ymsu6 gC6acsqKwFY0gFL/7GnWvSYjKoTcaNM536yR3zOTmFnbr97VV5a2LUKobFd/DJsMXrQ2 QwPw== X-Forwarded-Encrypted: i=1; AHgh+Ro2UK3LelMK9winlXAj5F9NNF1P3tVwh4WEqxpi49I4Xko0X3S+4ZeQGWQZn24mmq81mUuw6FfmZ9injg7C@vger.kernel.org X-Gm-Message-State: AOJu0Yx/ZcEqSSoTMl0MCLad1G1DzS+IE8Tq5S7nTYwMbmADVcBdzD3V GfTB1FQiLoB5R+tGmQ//JsGoCmdKf0BFPQr/+AZvqhXq8ZygBHn4N2j4 X-Gm-Gg: AfdE7clksXx0od9lDGfOanoU4CPLI9hLJJZ1N9dz3kphkYGft2BAJMKmyZGi1RCRm57 kmOelRvA6RWqyro18sHrUVkCZSCkXengVCsYx/KgY5Jv/TLPi957hDSDiirwaWM/10Ezogv6Rc+ pboRPpx6yG6fbFLDXn9JRgY/zTt45tNbOk1Xi7e2busenNMygqfSNfVcuJ+jlekWnxzQpoe0z3M PzZIv/W/r8zlBeieU3/TuY1Dk6XweFbu/AfHnmV3Jo1Yd13cbLfkJEYmICGGsKt6vtlxBzPv3JO AKpDuT39ZoIr+TB3OtXFpU1bDB3CeTlTLRTNgDK0OW5Yr2UErTN8SKwCFynm9JH4+UikBNEffJk fxRZcw78F21jRwvWsbfPh8e3XT6p9FLXdEG0syOxedv8GTY4jeJCNDHXJd7qeOcQkaxD34WQTq6 IfotZUBO0YOMVCwfCGQ5LjVxRm8yy3FjT4U818VXN8fwbKhMZCTvao1TBvPcCTlISRGSxUJYFls IYb0jQe+Pc5yY0= 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-arm-msm@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