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 92C3E419305 for ; Mon, 29 Jun 2026 14:16:14 +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=1782742575; cv=none; b=C/SKTcprADZ2tKPB+LO1krtH8hsgZERS0BMxK9OT1I+tE0L/0RUAVxNr3N9+ghb+xvft5Xp5A0BBMNcCfztyYUXnDHdZ8W+m8m8Z7QLwCQm6/m/XzJbZDavCeTRtBrvZpwt8OBlBaH3kVkd18iIBNyLi0Xzi0aFH1bb6AuOCDe4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782742575; c=relaxed/simple; bh=Nckl5SVHyDiYMHm3zoeeLm9lXkLDiRofsFKedfYvkas=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NLUvEwG/6VT3w9MXzsswUroYUlstZCwyjHhPRlkEt8Mdrfk/G1b3OQB0z6fuYoVPtcGi1vDszvtyDCrZNxxsKElMEL8mw/xF/jd71TmBvMHiRwEx8s7S5ALsFdArDatuSbpSO5H9KL8NY5qKsa6vhrombSGiXmKgKJxI5Cx377A= 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=dHK5ezpF; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=bMRdrRJw; 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="dHK5ezpF"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="bMRdrRJw" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65TAT3DU2604343 for ; Mon, 29 Jun 2026 14:16:14 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= T3ss0vjFpNbgbDRhLDHRKoVJrgStQ6KKT9k+hgeLDjU=; b=dHK5ezpFA9t782c+ 0F2Bx78154ND81E8diSkDLR0TNgjcNmslM8pde7u1amTd9q78KbA1NUzU8U3LyPF K3nWanZOJ5CXWSlBSmfXi0KPXJteUadto4B8dSvWPCyRgmAGgi89GdB6WS5kah+C FnAjGGlr3rCsCZ1Juo/J+MPpTG9JcgXoQlHxbv4OG3jyjpRrobMrUTvkQTSkW1jZ OZWF6ZjQH4DNeL/cOAu+gMnZV4mCo6jGohJLVdEGRS3Umuk06idJZlG6lp9rCgUg VXD5QYFNep7XePapSuJfNG310YMQ7b0cDvbIa0oCpSATzllzt5e8w/7j5IkIMm7U jqE5/w== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4f3nq8973h-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 29 Jun 2026 14:16:13 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-92e45453c94so406881785a.1 for ; Mon, 29 Jun 2026 07:16:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782742573; x=1783347373; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=T3ss0vjFpNbgbDRhLDHRKoVJrgStQ6KKT9k+hgeLDjU=; b=bMRdrRJwVXCtDFofL7sFub2TZ+M8STCTzkMZyw3VB2nMIB3D/+OPufF7YQiLCpOZ1E doRBXgKK6xRj2iacx6SQcJofbVQtj29yVo6MDTDSgqkxecxo7XGZhyNBZBzD2NYW/9Oh Xp094sIOUP6WgXTcfcGdnUbfc+geDyMm3SGGTmH6ngCU12Ent3IIL4F34hPGp9KbzZPe 9N/uwr7ypixJN1yZQILcwHIBRzTAG5IB8rTIlYW3PI8M7Ud23Y12NWeS9lBxzS0/Vjzj 6DggtVHdm1H20zT1l8g6iWJ28Fy5NYKZvz5yF/ydWhas/0ag/1qf63/9FKjJnARvSe9j SrzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782742573; x=1783347373; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=T3ss0vjFpNbgbDRhLDHRKoVJrgStQ6KKT9k+hgeLDjU=; b=n6N5hXbeoMrD2XDh2RD1tCq6cUXlLZuSt2CyOvaA2MVqUhokOd5IKf2Q4B90fTzMbQ oxASzhVfXdo+aQEuy/GGK10M3DlkrMXFRuW0GBT9cdYJ2wwJnzEdlVHljTaRzxvIWBzT ngCse3MGFe95kEym+mCCV84T8I33RZ+Q04+16CGTcpDVqqt0ZoEeMi5gyAkBtAjO7+Xq 3fvjBX+/+1ZRzpS5LggheEoiguWP3JxyT2MhaRbW5Lw8Ud1uiUcTSrwj+JtkWig9zL9Q A1OLzl9OZoCaw9CKspq2ck5YOLzxVEY3jqWlkFOi7EG7bbwPZsb9wZgkQd5FH4P5L05i mRmw== X-Forwarded-Encrypted: i=1; AFNElJ/JGSFXFHwFwA6IT3yJJuDpphEN62h4XYCoH95p7/czkx2fX4Sg0RdE0a52Pxt1KvbL4ADzHq1xqMznRxs=@vger.kernel.org X-Gm-Message-State: AOJu0Yz/K2ubrXOCF57Ci5kXmQwNHpLEt9B6oXuO9E4hFX8ahLup6AKw /5p2TJOCL/PnjoqBsOLZfHcCa9qrom0vK143tPZ91c1egISRosuGBEUqaiYHBb7350JDa3GUhnH sWYm/jFVfNxcdCAWum38Q9bHh8lirwwIfWHVXnPtDUeSQOGfr755owtNjlXmpwetNOVJIB/0X3U h/cw== X-Gm-Gg: AfdE7cm0QYIqY7u4SF/QTPLq7nFYofAkvUGyFgI2ZFwaRyJhU8oWfitqpPnj+edKqyf wcNIxaaKAQUVHEicRsv1Af+FRyVTi7maUYX7O1a2YWdAw+aQZom5z9QW6+Z5OqMOO/JSQ5wE4kJ Pru40GYbpWg4iJcCHvgKljpMQrSa+GPVaLxsrO1Ev3YzmWWTQT+9KQUS0StQcC8+bjX21XfUsB/ xhbA0Aznjbb9LlVTX9OL7wnUzECZKbsktJY2S0RDhzngWnI0Qv3pmhWE2ih7O9Xfx6RoCxvWrdT zmJ7vmBzpmR5nVvlETpL89qzUpIZGdasaKFdcvD+ruTgb9ZdnR6xnTXNnSjI/N8jr2DGYfu2WLb u7XLd+nof2xVrjy5QKKE2KdW7n0uvQ79kKqqmx+MBqhn4YAZViDdH1G9kdX2DWjLd3FAAsQ== X-Received: by 2002:a05:620a:4409:b0:923:8612:f15 with SMTP id af79cd13be357-9293bd3b210mr2439024285a.18.1782742572513; Mon, 29 Jun 2026 07:16:12 -0700 (PDT) X-Received: by 2002:a05:620a:4409:b0:923:8612:f15 with SMTP id af79cd13be357-9293bd3b210mr2439016385a.18.1782742571663; Mon, 29 Jun 2026 07:16:11 -0700 (PDT) Received: from yongmou2.qualcomm.com (Global_NAT1_IAD_FW.qualcomm.com. [129.46.232.65]) by smtp.gmail.com with ESMTPSA id af79cd13be357-9260079070bsm2143165885a.40.2026.06.29.07.16.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 07:16:11 -0700 (PDT) From: Yongxing Mou To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Jessica Zhang Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Abhinav Kumar Subject: [PATCH RESEND v5 13/25] drm/msm/dp: replace power_on with active_stream_cnt for dp_display Date: Mon, 29 Jun 2026 22:14:34 +0800 Message-ID: <20260629-msm-dp-mst-v5-13-2ed6aee1867a@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260629-msm-dp-mst-v5-0-2ed6aee1867a@oss.qualcomm.com> References: <20260629-msm-dp-mst-v5-0-2ed6aee1867a@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1782742144; l=4734; i=yongxing.mou@oss.qualcomm.com; s=20250910; h=from:subject:message-id; bh=qyaa9q2aizh+9xuBgPhFHv6SP6/o/UrGrHkmxoK5AgY=; b=UgHZC2uWpKjq6WlQr39Ul6beQkEn2XYnnMjGlhjWpIjVoqrTQAOEP0+EUP259R3FXtddl2s71 AEglTWRoyhNCpbfs7vyTrmoSwkLK0BlHFoigltEYTAPb/3Bj1FLE7mP X-Developer-Key: i=yongxing.mou@oss.qualcomm.com; a=ed25519; pk=rAy5J1eP+V7OXqH5FJ7ngMCtUrnHhut30ZTldOj52UM= Content-Transfer-Encoding: 8bit X-Proofpoint-GUID: fnDdrK4Dg6Yk0oD9DIeGzh2pVZKqeLcU X-Proofpoint-Spam-Info: AW1haW4tMjYwNjI5MDExOCBTYWx0ZWRfX8A/R35uHO5jR avEyCCspyhuYXRGG4XZDaDcAuoeWlPS21r4c4TMRxqsVUjVdCoeskuEEYiURy8NWZo2b2To2ZVg 4Z3yuJSaasg8zN12xMsL7Ak5EzMqaVk= X-Proofpoint-ORIG-GUID: fnDdrK4Dg6Yk0oD9DIeGzh2pVZKqeLcU X-Authority-Analysis: v=2.4 cv=PqSjqQM3 c=1 sm=1 tr=0 ts=6a427e2d cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=C3Dk8TwHQYyIj7nOf9RCJw==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=n0N2oAcnmnxAXiYSG7kA:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjI5MDExOCBTYWx0ZWRfX/5Zq0ZLVsSBR xjvZR4qL4FUtCr56Rwbqd3RBlsMELt9lJ8S1iTVZjfEqQFeKHpsUPmXYY0fRTlLlPGQUfYv3j3j gZcxsAncqjj2ldomWG9rNtIDjskUwAD0cuNTw16qxEh6dziFfnK8zRokPuL0X71vx2btjtmWRJq zwDICH6O5lYn+hLDqtFey2hmkGU1GYVuSIxBi9Oo8N4hjo5HFv+QUDabrz5kLrdpLSDCHjXNdDu AZTpVckUExUk53AywaXRCGDSNPmuO8mfQrwRTjLP2yxrGyD2yKXBhR6v1yexnG9IOF6BVMuyjtQ zdUGoC7pHJQw469y1Gck7jffJtm2SkSSgG7sP4q36LaexeZHSl2hsW1fUE2SLogrg37ucL/Y8Q+ mOL12hLcNTcNN79UNuTQ+bLia/bgeSNQuERYF4S2zng475oh3vmjrsKzpyXU+7VdpAZsITu86K6 A+ZvJvS7pRcTyWqobmg== 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-29_03,2026-06-26_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 priorityscore=1501 adultscore=0 clxscore=1015 lowpriorityscore=0 bulkscore=0 malwarescore=0 phishscore=0 suspectscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606290118 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 | 28 +++++++++++++++++----------- drivers/gpu/drm/msm/dp/dp_display.h | 2 +- 3 files changed, 19 insertions(+), 13 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 0e432f35cc51..d0081ea9f5cd 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -650,7 +650,7 @@ int msm_dp_display_prepare_link(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) { msm_dp_display_host_phy_init(dp); force_link_train = true; } @@ -670,14 +670,10 @@ static int msm_dp_display_enable(struct msm_dp_display_private *dp, 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, msm_dp_display->mst_active); - if (!rc) - msm_dp_display->power_on = true; + + msm_dp_display->active_stream_cnt++; return rc; } @@ -726,14 +722,14 @@ static int msm_dp_display_disable(struct msm_dp_display_private *dp, { struct msm_dp *msm_dp_display = &dp->msm_dp_display; - if (!msm_dp_display->power_on) + if (!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; + msm_dp_display->active_stream_cnt--; drm_dbg_dp(dp->drm_dev, "sink count: %d\n", dp->link->sink_count); return 0; @@ -850,10 +846,10 @@ void msm_dp_snapshot(struct msm_disp_state *disp_state, struct msm_dp *dp) * if we are reading registers we need the link clocks to be on * however till DP cable is connected this will not happen as we * do not know the resolution to power up with. Hence check the - * power_on status before dumping DP registers to avoid crash due + * active_stream_cnt 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, @@ -1535,6 +1531,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_vcpf(dp->ctrl, msm_dp_panel); msm_dp_ctrl_mst_stream_channel_slot_setup(dp->ctrl); msm_dp_ctrl_mst_send_act(dp->ctrl, msm_dp_panel); @@ -1555,6 +1556,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 55ffa22bb233..75dc40261723 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