From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 0A2814192F1 for ; Mon, 29 Jun 2026 14:16:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782742565; cv=none; b=cDhhOc5pmrDz36P/xxunry3BHiuBXKvJ+a4xVvPDSTPdLoZalX3ReMe3bqCIJmDw9n99frKoNPZQSST7m3zDnpxSyenOF+vO94zzGgZRZUGA2CF1OkwIHdwtmn99/o8R1hcGHqMN492CZ42mPE3v4qixVnalzV/nNhqv70BcGNE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782742565; c=relaxed/simple; bh=yGUsWWBpVJZ20b67T+qLNgW8SIPwI+1q8jEal6Hcy5o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MKgA669zFJTty1aqRiNKBM2usN+7xyeskZe6OcHOPodfni3Dy1bgCGL0ZHFp0cl0WO3MTc7+AyiRL5pjopA0d3PxKuk4v9Kh/nTmZl9L+V/7D3wBFLIBamimXbDMGdry41vYPdFlcB2JugBCZ456AgJKXY8VPNrbJsAGmWoElv0= 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=cxvB5Qox; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=cwd8JgGU; arc=none smtp.client-ip=205.220.180.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="cxvB5Qox"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="cwd8JgGU" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65TATKr22656125 for ; Mon, 29 Jun 2026 14:16:03 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= jusjjSJwJFuIT3xoYc/Wmu34BYtQlfiUmQ5CnQZ7+xQ=; b=cxvB5QoxSgcrXltE 7rm8q9solaabb8OY55XueCGR9zm+d2egTJIuILYpdhikWaJpyfqGDb6rGL0wvqto kc7f+2uKjpp0nmvKK0YJejvFMh1nITpUNxOyLYUWBHpotMcKgsDQc3BTeHouaT0O wzG11zqCNEOl52rYJzKafq8nBdW0kbyMw6yu75i67hJ1shjtR+CkkhWMjlXuj9UP O3YO3nSB2aHM9SFHizqa6XT+QiGBq7HGxRjIpf9mivlKkf6xKrlVlpC3swRy5NXI HlcJwavnFse+JwBBMZVsm+EDBGqW10eRTa2BNyJTOHcEyMogWQ9dNN6rdpeUz0Pt 5N3zcA== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4f3np7h6wf-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 29 Jun 2026 14:16:02 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-92b41f17488so461747185a.0 for ; Mon, 29 Jun 2026 07:16:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782742562; x=1783347362; 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=jusjjSJwJFuIT3xoYc/Wmu34BYtQlfiUmQ5CnQZ7+xQ=; b=cwd8JgGU6Nanj/oPDAIyJRSSZvNFDw0+soTbrawvpxRgElSNxpUeOLTV63XAwYw2vz OoyxZEXnYiJXJdHMu3m6k4CZ501gU1Enm4FcSKehDsJAuCSRC6qLPWIlFMfOM0EoUvG7 yWNHXqYU1vDPATXJJ0Uw5js6CN57u9da+/L/BLfrxlGXIxckijp0tn6gVI6c2ps0q4iD LfsTAaXYmIV9Mv3Q6nwNSbK5vskjyIYdjAjq+N6gZGd0EeJGmG8Y5FJvJ4gdFqNLlBXe fMeH/t0JZh5K/w+HGkOOq01+1Oax2hrISkdwzAoT2fkaUOZnRDZjdvRrJ2v6Eg1w8Ap1 i2Lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782742562; x=1783347362; 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=jusjjSJwJFuIT3xoYc/Wmu34BYtQlfiUmQ5CnQZ7+xQ=; b=VjQKPSNauWwgE9H368kkDYOsr2WryPUHKinr4EU+0JdJi2kIHpwDVepkO6uoztyd2l +SqIVz4iOqpiaUYMN7GJP4vnDYNu2PAO3U4YuK4Hnv4mt2D7UNdRY2tFXin9CMBpU2vo wd28QYG564B79xyfFNzxED4x/wM1Jfl8WjPPtQYX6PYlbwODAAMGXdWd2yvIQ15a8t9J sfjbKqrpsHjRRX/D/AsI+bLtP2Cw7cU3tW5fV+sOb9b5oHWnm8VZPuFNBrA6+ZqnwbKb m8IoH1jk8Gv1NeyqIxHECjFQT/VeHjAKbvK/hkOAvcYtEJgvMoNVF9lhbGbRqxUxZXda 3rGg== X-Forwarded-Encrypted: i=1; AFNElJ9fPJFp/YluFR0WWAWToApHb4aX0exa88EnkW/G4Gketm46Tzo4gVN0UAQapsoUEMYULo6igRiSmLZGeLU=@vger.kernel.org X-Gm-Message-State: AOJu0YzpuU2Y1bMo2vzQ9WJDRxItWOMeQ1ZVY9raixueIq36y6ltvim/ 8ASErGLTUMDFdTkhA+pcn7aWoxvsBGntiKtC1nmeuVt0OyzzYS/hUke1Us0jxKWHkbgUn48rvNz b/BCak6HqyjrJyu92q9AGX3cI+Q5gyzCz49C3PLvKXXYJxn7no/TMMaR2P4jAel4pKtQ= X-Gm-Gg: AfdE7ck31loA+TZbqQgcZ44OKmM7Uy1f9boLqtrpwnUEMnW5lmat1RNpUiMRyO9k4nv NoWRTKXMR8zeAFIu1xXGH8ABvkpHCvOAonlfibGCMHlb/4hDHfIErQ98qXC/iAh2SYFEPqMIzVy rM45saRfsuLXI/TYah00lJeqVRPJ5fl5NwRaW8lUfXhvOG/Rt67nd9rjSUVdvnQCYnNV/75QF8X Q17mJb6QEjO9BkKsYEe7CxmdOhpuxHoFtuNDdmVHeJLwdYGe6MOPBCW34DwYqLiFiJPTQiXOu6T 6YqpAQynRh/LWEbwzcpa9r14dXy3qCST2fm/9koLDKDywU5EOKOzSGA9DMYvODOjzbn+HkF1Tan Kg98HyJiiBk4RDyjgtkzpj9dGZung2sDxzyEZpfXvXtyQS4Y6Pgcm6TJtLCiR6wI1CLBF7w== X-Received: by 2002:a05:620a:298e:b0:916:1785:57bf with SMTP id af79cd13be357-929245f72cdmr2204617685a.6.1782742562265; Mon, 29 Jun 2026 07:16:02 -0700 (PDT) X-Received: by 2002:a05:620a:298e:b0:916:1785:57bf with SMTP id af79cd13be357-929245f72cdmr2204612685a.6.1782742561771; Mon, 29 Jun 2026 07:16:01 -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.15.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 07:16:01 -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 11/25] drm/msm/dp: move link-level teardown from display_disable to display_unprepare Date: Mon, 29 Jun 2026 22:14:32 +0800 Message-ID: <20260629-msm-dp-mst-v5-11-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=2662; i=yongxing.mou@oss.qualcomm.com; s=20250910; h=from:subject:message-id; bh=UZK+i8p/CNPfHLt8Mk2BsBISLw97recIVNrtzpulGWs=; b=I2VV7JlMyhcGJkCIjc/NlH/o7POr83aPjN3c+htVlrhxoHABnh2Ue1pf+4lkG+XDMmHnUl8rQ i0f9ctCuievBYGDG8uT3BWyNASZOjbfjlVjw3dKqmChTMXwbxIsbAPs X-Developer-Key: i=yongxing.mou@oss.qualcomm.com; a=ed25519; pk=rAy5J1eP+V7OXqH5FJ7ngMCtUrnHhut30ZTldOj52UM= Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjI5MDExOCBTYWx0ZWRfX9/7eQl7Bj5Ng jbETrdrnuc3rRBAQCiN2ARV7IX3a7Oa2fmfe7E9bUyTgxK74NbkY+zSkSGSvhZH2GggBpbvxmom p5Os5EI0EeH5GS9V/1JdkTvmxPss6sAfJNufsh8JPwxLEpQX0zoE9eCz4paJ+79jazRvQtA0AIt syExBOOtb+nx8/Jx4NBZyyMDDP25ekb6OZ2QUIBXFosuEZGBH/gCsYb4U4YALDBhgxG9Z7vTPHh iE2/5uxrtOZaU1pHLUYOjNG0RfSowqZGDhdxaQ23dw2gHtoiATvfN0OwxzwfztObDEP/pGFaYDg 5Ba0q3rsmJ0Yvs3f+ONCLCjGVgOZDa9wH3PAW+06UKPx9IZxQyc7TYRryuexeGdXVEp56n5nXBh I9rng21I55vE/cXzGW8XSErtK2iUOCICCljSAScM4ShNYp4q8GlKQxtIS8/Fjwmk3C5oxxoWGih JZ7J1hiuOlJm1YIvFnA== X-Proofpoint-GUID: n0AKWcp3yjgknIoCs6eNTZIITLsLpChA X-Proofpoint-ORIG-GUID: n0AKWcp3yjgknIoCs6eNTZIITLsLpChA X-Proofpoint-Spam-Info: AW1haW4tMjYwNjI5MDExOCBTYWx0ZWRfX5MfTGLE60OPb LgIUslXNoAaZVhS915r7fMR+G6w1XGoWcjbaGLbfuHyVLYaBPb2X9SK4SNsR3ZiYlg6nq3a9Zip q5uvRlkSjnL5Fp0j3ZrvwAcytYY984Q= X-Authority-Analysis: v=2.4 cv=OcWoyBTY c=1 sm=1 tr=0 ts=6a427e22 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=C3Dk8TwHQYyIj7nOf9RCJw==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=a95-bzEMD9sxZBs1_CcA:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 a=TjNXssC_j7lpFel5tvFf:22 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 lowpriorityscore=0 adultscore=0 spamscore=0 clxscore=1015 phishscore=0 bulkscore=0 suspectscore=0 impostorscore=0 malwarescore=0 priorityscore=1501 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 msm_dp_display_disable() currently mixes stream-level shutdown (disable VSC SDP, off pixel clk, clear power_on) with link-level teardown (PSM config when sink_count==0, off_link, PHY re-init or host PHY exit). For DP MST the same link is shared across multiple streams, so disabling one stream must not tear down the link. Move the link-level steps into msm_dp_display_unprepare() so that display_disable() handles only the per-stream sequence, mirroring the split already present on the prepare path (display_prepare_link vs display_set_mode / display_enable). SST behaviour is unchanged: atomic_post_disable() still calls display_disable() followed by display_unprepare() in the same order, and the cached dp->panel used inside unprepare is the same panel that was previously passed in. Signed-off-by: Abhinav Kumar Signed-off-by: Yongxing Mou --- drivers/gpu/drm/msm/dp/dp_display.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index 1af56c84b82e..1680a67284a7 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -731,18 +731,6 @@ static int msm_dp_display_disable(struct msm_dp_display_private *dp, msm_dp_ctrl_off_pixel_clk(dp->ctrl, msm_dp_panel->stream_id); - /* dongle is still connected but sinks are disconnected */ - if (dp->link->sink_count == 0) - msm_dp_link_psm_config(dp->link, &msm_dp_panel->link_info, true); - - msm_dp_ctrl_off_link(dp->ctrl, dp->panel); - - if (dp->link->sink_count == 0) - /* re-init the PHY so that we can listen to Dongle disconnect */ - msm_dp_ctrl_reinit_phy(dp->ctrl); - else - msm_dp_display_host_phy_exit(dp); - msm_dp_display->power_on = false; drm_dbg_dp(dp->drm_dev, "sink count: %d\n", dp->link->sink_count); @@ -1533,6 +1521,18 @@ static void msm_dp_display_unprepare(struct msm_dp_display_private *dp) { struct msm_dp *msm_dp_display = &dp->msm_dp_display; + /* 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); + + msm_dp_ctrl_off_link(dp->ctrl, dp->panel); + + if (dp->link->sink_count == 0) + /* re-init the PHY so that we can listen to Dongle disconnect */ + msm_dp_ctrl_reinit_phy(dp->ctrl); + else + msm_dp_display_host_phy_exit(dp); + pm_runtime_put_sync(&msm_dp_display->pdev->dev); drm_dbg_dp(dp->drm_dev, "type=%d Done\n", msm_dp_display->connector_type); -- 2.43.0