From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 7D05838239F for ; Mon, 15 Jun 2026 08:45:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781513122; cv=none; b=kttKcB2lZliW7v9EQv659GKt4PG2mP83YpR1UHK4fheqNNGCEkZWlzffvoRAenN+++vZlFpbwKag/9+e+hlOFCCRveZGWs+Y32GbQlQ7oBhENYX520KQMDrzL87kYhe6pzwhqIp9gpXkmAS/QbSH53JVd/d9xIXmQP2ztHQd0fM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781513122; c=relaxed/simple; bh=oeyFp/rLjtgwy3CCUHUOw3xMPq9muEEBuCjM9V9OkJs=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=fT8HOobg1xXlgDhnvk9afivHNSHuld+oUz7LQWCaWzgqTBWdUoZcoMxMIVdsvI9Tb0DMBEJhmGoev9u5DtAcrIvbD1P42/PjA56HnVDx2ROqmCTwoNO0tpm48ZV71e0LPRMFBXBIod9GAk4wDe8lGy7KWROd5cs5AIqgJ0q/4bY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=L3rR3dIO; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=NN9nxHHo; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="L3rR3dIO"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="NN9nxHHo" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65F6Ilwk1835761 for ; Mon, 15 Jun 2026 08:45:20 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= V7p1TqGbxKOzqKvuGX8oUhCBkSlMWPS5HXB/aBjrvlQ=; b=L3rR3dIOdeyvn4/F 6QQU8XUmCp2kYAKNzSw2T6jK/FyUmfHH6xKUStHQi0vIqdPRTGi8yIVQUplNuzT6 ouM1tZh6OHHcbNM0SI99oIL7cq+kjhAbCG5w8RddS6nAj+BDb+e2hLUik19JM0SM iDPmKbEsItYz8rWe2kR/cbQbTy3EjRsTHwlxGAWJVNO5L0hFcp3YRESZWrVmtkf5 naooRkIya17UHgpkXbZKJZMneywFugiatbAnh4TvU65QYMxrW0xYgBz4wwdWjOZ/ /qD5LjjUALSyAbz5Wu6+iZbau1GiAajIHRV81L7S7eQlKzgCbJmM/jOlNzKuyTsg 9RCKeg== Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4eryffpf59-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 15 Jun 2026 08:45:20 +0000 (GMT) Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-c85a3669a15so1639749a12.1 for ; Mon, 15 Jun 2026 01:45:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1781513120; x=1782117920; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=V7p1TqGbxKOzqKvuGX8oUhCBkSlMWPS5HXB/aBjrvlQ=; b=NN9nxHHopCq1Z2O67KGb9MyGAptJaZ/DylBP0POTvYNL4DHqeeFj0KMareZ2fx/e7V m/HXm+59OO6hhSp5avC9pAXcur8dGXjVHLges/3TeXsoU4ZDiKckA6vUDkNLnoUDlDt/ CZd2OY3M1wMBNwDcLzdAiJAMpr9DSmxGtU8KWptfbK1XjdujjWAfba3tLS7HFWikwO+B mB0mtj6j+90QBr9RAqwhuQw48hWYK7aFlcW03jRU29KMRSzDbdfsT4cyG4SRs9Pet0qZ N8x0vbbkB1hngGtYBCZsPkv/9Ly+yg6tPWv8jB/rDLcVWHdUg7xn+Q0zGJDEEPbtoyMs Afpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781513120; x=1782117920; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=V7p1TqGbxKOzqKvuGX8oUhCBkSlMWPS5HXB/aBjrvlQ=; b=qmyNbnzJjarVfrlAL3fWwemHDmRU1DxQdEMei37SPaTpQEnA/R6bX7Ruqf3HQy4HFU 4r258SvYS3GwLWPZMiqY1jOIANNxPY1TBlW5up8sDQm9G0CK6b6xqXsHFDPsKZRLZCNO HGyhOYOVCZBFszTiVeJNhLOj5MO7svn+vGyPaRgY4QzqAxcb/K0UDfk6KktjgdqcmxR4 QX9pdhT2nTtNk52m6ksZspruP5ZtT4RbgEu0yeKInpfF8Phes4f08HFz+O2GCPZv2BCT f8MDdxvqIam8Z3fBmA+ZCRS7P11fAn7Jbsb6x/cU8I3QrvXXsFsifGoJVK87OJzLlpmx caMg== X-Forwarded-Encrypted: i=1; AFNElJ+8B4RV4im9n1pCpuDyCWW+01iRRm08HgePiq1MNaRao+uGgtfSRnDEn8xPvlesqbj7jLpQOxkKcajDg/w=@vger.kernel.org X-Gm-Message-State: AOJu0YzLfXuqlAtdT7BySlAB/1HIiWxS2HSXki3UsHMsHQBvVrqTJoo9 zbseHFnGDADGTyC15j3WlvTWPI5AH0wfCGnXr4q9PxGe0cr94bo0fSV2QuCIt/D2nc6W0HYewR8 c3S6rBJNX7uagFM13GhDsqQZcMr038jeLesMFOo7Ulam/ZV+dBUrwzwzQSrwgEorEO8A= X-Gm-Gg: Acq92OEhWcL7VHrhyuiDz6h9Lp4IgaNLS28O1sldNcmZExX2FGTbjiSJvrvRlswp39X PAyt+D/RDDlCX+LCOQoIolv1yQ3799r9D7ETUm4067SNkCg64g00u8PFbG1Q7hLSGkC2vAMRTns 7Fh4ZGUYYi1luLFBDqcwzNFl9VfrTuzG1I0njqffZrwoKWEFJmGCgRGYmIJc5WisgYvqR7W796h 4qH9svK4OG/KhzzzS9LeYI3Zw0cMcpIlk+tsd5HvGOmVbR6N6/+BZnufZrBuwTNzvrsSqFlw+mN TTvnOi7YWujMigGsf1DiBkMBl1kT2mleTejL4niybM/Gf5bYIQtdudqgx+MaUpfBlhDrGPN3QfE A2LVn4uRkQK6zIymjCA/Y1V8K4kW/7yEVwzkw/Mg9C7Rlb7t4HIFQuK0qnt+F9ScPkYEaBNeHvv SsU2FzHsG6YeGI6z/9Vg== X-Received: by 2002:a05:6a21:458b:b0:38e:92f6:9ab1 with SMTP id adf61e73a8af0-3b78588b46fmr11370749637.22.1781513119954; Mon, 15 Jun 2026 01:45:19 -0700 (PDT) X-Received: by 2002:a05:6a21:458b:b0:38e:92f6:9ab1 with SMTP id adf61e73a8af0-3b78588b46fmr11370715637.22.1781513119450; Mon, 15 Jun 2026 01:45:19 -0700 (PDT) Received: from [10.133.33.122] (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c86651aef27sm8248972a12.30.2026.06.15.01.45.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 15 Jun 2026 01:45:19 -0700 (PDT) Message-ID: <9219adc5-e394-4d70-a580-f85bf860e566@oss.qualcomm.com> Date: Mon, 15 Jun 2026 16:45:13 +0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 27/39] drm/msm/dp: replace power_on with active_stream_cnt for dp_display To: Dmitry Baryshkov Cc: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Jessica Zhang , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Abhinav Kumar References: <20260410-msm-dp-mst-v4-0-b20518dea8de@oss.qualcomm.com> <20260410-msm-dp-mst-v4-27-b20518dea8de@oss.qualcomm.com> Content-Language: en-US From: Yongxing Mou In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Authority-Analysis: v=2.4 cv=HuxG3UTS c=1 sm=1 tr=0 ts=6a2fbba0 cx=c_pps a=Qgeoaf8Lrialg5Z894R3/Q==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=1XwNoAEaEPKn6H4yol4A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=x9snwWr2DeNwDh03kgHS:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-ORIG-GUID: yPBps4mNcT40Hok0N6c_FV5lHdq9EQks X-Proofpoint-Spam-Info: AW1haW4tMjYwNjE1MDA5MSBTYWx0ZWRfX3dno2pyYBv3g LVfPvT/XmUiEEGtMWWt46Li4zSzCj5ysaDTqXrmbS0rYeBlfg3suHBuJnaAB6t6ncHvtQNS5der bZvJ49uE8e65D4/gBMz/XrM6LWXWUMM= X-Proofpoint-GUID: yPBps4mNcT40Hok0N6c_FV5lHdq9EQks X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjE1MDA5MSBTYWx0ZWRfX9vK5eU3sVr3D HzY1AKbfldJEWvTQUV06M1INMmAdmDKaATd+6yko/0oOrZOaBC9mSYNFm5ybfAVecQu9i7BPK0B 46HpmnxYwcN8g/y1IwG89i94sutZy+0bzM4jTz5qTVDUOV9pcL8zRnUjpirwz83JeGlME4ehe8I CavxWaUCdMwLX7en2apA7mXYMPAdOtmJM856sMGamKODuUi+fo7LMhKILmaiaa3P0J39EslENan kMkdLmBCr0ovVk3MM753HABPSyeAMmtBUajy4zNF950Zx101SSZpp0/wAP8jpANP23E7AGRheGb iZyFIdOxGd3DUEhrObb/DlwL3a8Mhjy6pypxxqjLwZwYuylWAROTgg4YNjls80A6RNruQ7fNyPF X2ssXO70W+31ABgprUarhPFzMfYgRb8LugndgyIoAkL4hP1JmASd5zls5P7WRb+r2o/HONvWc+m uCie58Br9aJV7XQBNsQ== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-15_02,2026-06-12_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 bulkscore=0 adultscore=0 impostorscore=0 priorityscore=1501 phishscore=0 clxscore=1015 spamscore=0 suspectscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606040000 definitions=main-2606150091 On 4/12/2026 8:11 AM, Dmitry Baryshkov wrote: > On Fri, Apr 10, 2026 at 05:34:02PM +0800, Yongxing Mou wrote: >> From: Abhinav Kumar >> >> For DP MST, the link clock and power domain resources stay on until >> both streams have been disabled OR we receive hotplug. Introduce an >> active_stream_cnt to track the number of active streams and necessary >> state handling. Replace the power_on variable with active_stream_cnt >> as power_on boolean works only for a single stream. >> >> Signed-off-by: Abhinav Kumar >> Signed-off-by: Yongxing Mou >> --- >> drivers/gpu/drm/msm/dp/dp_audio.c | 2 +- >> drivers/gpu/drm/msm/dp/dp_display.c | 38 +++++++++++++++++++------------------ >> drivers/gpu/drm/msm/dp/dp_display.h | 2 +- >> 3 files changed, 22 insertions(+), 20 deletions(-) >> >> diff --git a/drivers/gpu/drm/msm/dp/dp_audio.c b/drivers/gpu/drm/msm/dp/dp_audio.c >> index 41018e82efa1..035e230201fd 100644 >> --- a/drivers/gpu/drm/msm/dp/dp_audio.c >> +++ b/drivers/gpu/drm/msm/dp/dp_audio.c >> @@ -284,7 +284,7 @@ int msm_dp_audio_prepare(struct drm_bridge *bridge, >> * such cases check for connection status and bail out if not >> * connected. >> */ >> - if (!msm_dp_display->power_on) { >> + if (!msm_dp_display->active_stream_cnt) { >> rc = -EINVAL; >> goto end; >> } >> diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c >> index 33d8539afee7..e6ecbb3a688e 100644 >> --- a/drivers/gpu/drm/msm/dp/dp_display.c >> +++ b/drivers/gpu/drm/msm/dp/dp_display.c >> @@ -657,15 +657,15 @@ int msm_dp_display_prepare(struct msm_dp *msm_dp_display) >> if (dp->link->sink_count == 0) >> return rc; >> >> - if (!msm_dp_display->power_on) { >> + if (!msm_dp_display->active_stream_cnt) { > > Okay, I'm now being lost between the names. When is prepare being > called? Is it still part of the atomic_enable()? Or atomic_pre_enable()? > I’ve renamed the function to msm_dp_display_prepare_link, which looks better. We’re still in atomic_enable(). >> msm_dp_display_host_phy_init(dp); >> force_link_train = true; >> - } >> >> - rc = msm_dp_ctrl_on_link(dp->ctrl, msm_dp_display->mst_active); >> - if (rc) >> - DRM_ERROR("Failed link training (rc=%d)\n", rc); >> - // TODO: schedule drm_connector_set_link_status_property() >> + rc = msm_dp_ctrl_on_link(dp->ctrl, msm_dp_display->mst_active); >> + if (rc) >> + DRM_ERROR("Failed link training (rc=%d)\n", rc); >> + // TODO: schedule drm_connector_set_link_status_property() >> + } > > Again, this more than the scope of the commit message. > Got it..I will update the commit message to explain why this change is needed. Under MST, preparing the link only needs to be done once by the first stream. >> >> return msm_dp_ctrl_prepare_stream_on(dp->ctrl, force_link_train); >> } >> @@ -674,18 +674,12 @@ static int msm_dp_display_enable(struct msm_dp_display_private *dp, >> struct msm_dp_panel *msm_dp_panel) >> { >> int rc = 0; >> - struct msm_dp *msm_dp_display = &dp->msm_dp_display; >> >> drm_dbg_dp(dp->drm_dev, "sink_count=%d\n", dp->link->sink_count); >> - if (msm_dp_display->power_on) { >> - drm_dbg_dp(dp->drm_dev, "Link already setup, return\n"); >> - return 0; >> - } >> >> rc = msm_dp_ctrl_on_stream(dp->ctrl, msm_dp_panel); >> - if (!rc) >> - msm_dp_display->power_on = true; >> >> + dp->msm_dp_display.active_stream_cnt++; >> return rc; >> } >> >> @@ -731,16 +725,14 @@ static void msm_dp_display_audio_notify_disable(struct msm_dp_display_private *d >> static int msm_dp_display_disable(struct msm_dp_display_private *dp, >> struct msm_dp_panel *msm_dp_panel) >> { >> - struct msm_dp *msm_dp_display = &dp->msm_dp_display; >> - >> - if (!msm_dp_display->power_on) >> + if (!dp->msm_dp_display.active_stream_cnt) >> return 0; >> >> msm_dp_panel_disable_vsc_sdp(msm_dp_panel); >> >> msm_dp_ctrl_off_pixel_clk(dp->ctrl, msm_dp_panel->stream_id); >> >> - msm_dp_display->power_on = false; >> + dp->msm_dp_display.active_stream_cnt--; >> >> drm_dbg_dp(dp->drm_dev, "sink count: %d\n", dp->link->sink_count); >> return 0; >> @@ -876,7 +868,7 @@ void msm_dp_snapshot(struct msm_disp_state *disp_state, struct msm_dp *dp) >> * power_on status before dumping DP registers to avoid crash due >> * to unclocked access >> */ >> - if (!dp->power_on) >> + if (!dp->active_stream_cnt) >> return; >> >> msm_disp_snapshot_add_block(disp_state, msm_dp_display->ahb_len, >> @@ -1559,6 +1551,11 @@ void msm_dp_display_disable_helper(struct msm_dp *msm_dp_display, >> >> dp = container_of(msm_dp_display, struct msm_dp_display_private, msm_dp_display); >> >> + if (!msm_dp_display->active_stream_cnt) { >> + drm_dbg_dp(dp->drm_dev, "no active streams\n"); >> + return; >> + } >> + >> msm_dp_ctrl_push_idle(dp->ctrl, msm_dp_panel); >> msm_dp_ctrl_mst_stream_channel_slot_setup(dp->ctrl); >> msm_dp_ctrl_mst_send_act(dp->ctrl); >> @@ -1579,6 +1576,11 @@ void msm_dp_display_unprepare(struct msm_dp *msm_dp_display) >> >> dp = container_of(msm_dp_display, struct msm_dp_display_private, msm_dp_display); >> >> + if (msm_dp_display->active_stream_cnt) { >> + drm_dbg_dp(dp->drm_dev, "stream still active, return\n"); >> + return; >> + } >> + >> /* dongle is still connected but sinks are disconnected */ >> if (dp->link->sink_count == 0) >> msm_dp_link_psm_config(dp->link, &dp->panel->link_info, true); >> diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h >> index 0ede5505be58..2548f67cd441 100644 >> --- a/drivers/gpu/drm/msm/dp/dp_display.h >> +++ b/drivers/gpu/drm/msm/dp/dp_display.h >> @@ -18,7 +18,7 @@ struct msm_dp { >> struct drm_bridge *next_bridge; >> struct drm_bridge *bridge; >> bool audio_enabled; >> - bool power_on; >> + u32 active_stream_cnt; >> bool mst_active; >> unsigned int connector_type; >> bool is_edp; >> >> -- >> 2.43.0 >> >