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 6343C3D5C1D for ; Tue, 2 Jun 2026 09:12:07 +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=1780391528; cv=none; b=gbB3w59Wy3HzRhPaW/CwCQKnzXDgQjT66Wtmga7C2DWbVFgfPeeC1hZ1pxlU0f7ssznFO8FW0VK+f5OHZzGzXg3E83p7WzQpr+vMfH616NVjl3NomRn6OrcAuO7NBo0nMXAD39f3B7yYgT7XGUOfUyg9ElqrGySN0WfADYKjHlg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780391528; c=relaxed/simple; bh=k+fjd0uAzZi7jcHsWm9CXjVJSBGmbgcOCLEymAHwJvg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IqVvV7PzNJ+7JKye2NHr/k/3DMiiJPUaQOQWHO7wZAwFYaDrJAhf+0JwfY9gE4wrh18au26+25kXHTse8/zJoj3ZKh3DFIzXhi57Xvp3mbK1h+DqqfeATe29QOxPKmlp638XaWyNh3OzSzEQ6mznTnb5L4pzp535+eUcURef28A= 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=Nc6DvaV6; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=P9yZfLoH; 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="Nc6DvaV6"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="P9yZfLoH" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65245kBJ2692148 for ; Tue, 2 Jun 2026 09:12:06 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= Re9bQbGzhFUu/DwhaF7px31nxHQNbIQ8lgyi807eAgQ=; b=Nc6DvaV6tvosR4JA oYrChKsp58rejt9+eaHJ0rJ2iCgrOF33GM4I0Bv+z1OmU7e/sTSDIwDug/yw5u7i TTXi6qJoKf440aE0AjBzsLr4xT6epgHORMcHZjP6JFm4pmOrv7oyYsgg8ae4+f1s fjWkHnwnkTTrSHE4+KL219MhkrufEpodNXSI6OyBHJ+dTZccRXbuzZzIaYikUd6m 8paOO1b5y0tCkx9bHzbIcHMeUst330fhjUUK0QBf+iajXJ4i8nTAu0lqrZ5v83xs U5KZ/REABHG8Xj8MJzCjAH5EU2ISSY0K+e034u/bbSscPPTa/Amz4EcDd6Zhny2m EXKlCA== Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ehqumh6h5-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 02 Jun 2026 09:12:06 +0000 (GMT) Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-516d19f68acso223408181cf.2 for ; Tue, 02 Jun 2026 02:12:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1780391526; x=1780996326; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Re9bQbGzhFUu/DwhaF7px31nxHQNbIQ8lgyi807eAgQ=; b=P9yZfLoHV0OdKIgmEa0MHVhht2IaeTKxyY7IM1MJybbG8G2a+w/dwhVa1z1vI63QbT fNZ09YpsoXxtuZPbJD+GKyJ73Mfmt7RDFucYUAGzeVJVYcsrzWAdOjieoOLLNiQ6TD5D fOCh9+RcFP5NksoOkBxE0scCAENA9iFBJtHY2IXI1bRhHFK9/2sbRmr0cgxQImjGB12A txdYkaXopzFla5ua//RTg5gX5rxqEL8sc+Rhmgih+Cxt4QAh1wu+HPahBqTbOpgJMTMG xRD7okIM8f+ZmxEc2GlhtvjSECQW+r42HqwAQOB17nbdCsuNHrV9VNtCBrZyFiu+qC6n WSog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780391526; x=1780996326; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Re9bQbGzhFUu/DwhaF7px31nxHQNbIQ8lgyi807eAgQ=; b=sar4AT6uvmnQnapoHCutBrpBjEQkXMVPlQgjiEMW7+ZKaV3n0+S+ACNInNboXNZJ8w RrYsQMuY2oQ9ac6vmxqGYJ6gmbeo1NkntRYMkr8FaVGJTjxFmu0GbBFPWvtWGZD6IBY2 MS9I1CRH8K48yz/l4TB6RTNmOh/lGZ+ecpmLrKy6GCJRGaRogiEof5PzZG+YI4vdYKqy PBEhW+FZI8p05PT5G0mtUvhJUDyRRcFyAn08YWGQu16o61Kz74AZteeHA319qS2t8GEk mOPCoQaSvGq9WJRyR6Z6eZMeRl2y5u5VWZwdgJ2XeaCmcZE+1Y/3dUi9qxkrCOC481KF Fxrg== X-Forwarded-Encrypted: i=1; AFNElJ/so2zZrMMJTeUfQE8M+BpvSWzfq4/8FV6HxGq6NsHrl8PlhZBQciE9ykaqiPfNtYuzpZruthvwSTA1XNs=@vger.kernel.org X-Gm-Message-State: AOJu0YzMCLN9YKefasJp7MI/zqAJgPsxBtMpP6ckwk813HYNJYtdQBih Fq0plHO2y7oz9tP1XDhI8E3oau5r87N8GEHZ09yoylyuKkn1yhdk19HF24x4Kz/Ah8SB3v3SxLp UsjMutTkjuOFakKGY4nt6T8ZOg43F2qAzR7t7jrAHbqr0Yu4RmNqrUF4T0IebmvKxFCY= X-Gm-Gg: Acq92OFqovyODi14XMBMUj2rCYM8plDymQaSzIp4kfp94nTxntWus248JmMUnPVrzEG jpSJasvit1750CEtNGKq5x2fKYFU40nQXetAeI1HgB4iLblIWZHJbQK20aGwi7spyKI8FUumi0p lyO3fY27PxkCzbeHok1cjW0STHlGT26PJZybdwHsBaGUZLRt5pqZQ5zmD46pKCAL/IMBJ39LElj i3eG5qIxxyhw3Ngs682pjBnagBm2mfCENkTz3g4nbzQebQswsUdtYeeKuvYXpRtQlnW/jnw/iIY qPDnEUdb1Sb74m+0itrgYMdUQr5Hd1RySmh658umaH/IXfmmEf+z/T9l4D1WIz5i9/mzdQj5HJr wM2olxzJmC/QocwlLvEXJh5qhBE9FBwxVOYu3YbalCUUZTRU9p0B4IAL0C+tNNOJ5MKypwIs18O nBCQgOSllueWC05qak2Q== X-Received: by 2002:a05:622a:2a99:b0:516:ea30:8756 with SMTP id d75a77b69052e-5173a817bf7mr147694351cf.36.1780391525585; Tue, 02 Jun 2026 02:12:05 -0700 (PDT) X-Received: by 2002:a05:622a:2a99:b0:516:ea30:8756 with SMTP id d75a77b69052e-5173a817bf7mr147694191cf.36.1780391525127; Tue, 02 Jun 2026 02:12:05 -0700 (PDT) Received: from yongmou2.ap.qualcomm.com (Global_NAT1_IAD_FW.qualcomm.com. [129.46.232.65]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-51768c76e53sm12480851cf.4.2026.06.02.02.12.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 02:12:04 -0700 (PDT) From: Yongxing Mou Date: Tue, 02 Jun 2026 17:11:21 +0800 Subject: [PATCH v6 09/15] drm/msm/dp: re-arrange dp_display_disable() into functional parts 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" Content-Transfer-Encoding: 7bit Message-Id: <20260602-dp_mstclean-v6-9-2c17ff40a9b2@oss.qualcomm.com> References: <20260602-dp_mstclean-v6-0-2c17ff40a9b2@oss.qualcomm.com> In-Reply-To: <20260602-dp_mstclean-v6-0-2c17ff40a9b2@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Yongxing Mou , Abhinav Kumar , Dmitry Baryshkov X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1780391476; l=3890; i=yongxing.mou@oss.qualcomm.com; s=20250910; h=from:subject:message-id; bh=4Wm5dEjIlmt2dcJEpToKqMf/8eYUPZtjPLztPMLreZM=; b=q9czTavEj55EDD0AC9Z/pXgndqDGASyPrB0KPxwVGUMSDYpltbQSYpgN4VQ52U3vd4U83sncs RnAAe8Hddw3BAlPxYuDw4b+ZzuwYkZXgka4Ug2HDZ4cKBumqFN7Lib/ X-Developer-Key: i=yongxing.mou@oss.qualcomm.com; a=ed25519; pk=rAy5J1eP+V7OXqH5FJ7ngMCtUrnHhut30ZTldOj52UM= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjAyMDA4NiBTYWx0ZWRfX/qXhWGiHoABf rlF9IFAUZ/nehWYMx8msvojG2JfteYG7/T2NXSzwyIA9L8FQVUk1BDUKMPMjMPgz9k/RFBgBRdb CIN8uHw0znYAJJdgH9Z9ngZMFL/IaVaGa9anHcj1KBQ/N28lCdixOEeg5/O9I93J2d5qt/vrGnE upjTGtRVQOcbmfe0kgubNny8UCYUdImcB7uQWRz/Rwr8jVFo8SR5HbZLNF0PP+yzdTXSDzBD4HP RS/yUPQUxpKSnqGUvOJD+zf7tYiTOf84sgvwkZqAXfObPrkjCQ9KDNIA8S3jHz02hRGDO0cx89M t8XUscX/GRIh04oS9mZTrsZ5kisIMy/5o46omsaeATzGnQuaxJcELb6+dCwTBwUk+195hZuaMBd 3hto8/v4Crr6dQ0qFo8ZsJvYtunMQn0/VXN2K/H290Fa103tTvCHLHh11Bzlw4nfqua7LkMEW6n 3jAe0ZOCxr3xw6wOsgQ== X-Proofpoint-ORIG-GUID: LTkTsGSvRpwkdqezf7zZ9-TmAZNUFl1m X-Proofpoint-GUID: LTkTsGSvRpwkdqezf7zZ9-TmAZNUFl1m X-Authority-Analysis: v=2.4 cv=Rrv16imK c=1 sm=1 tr=0 ts=6a1e9e66 cx=c_pps a=mPf7EqFMSY9/WdsSgAYMbA==:117 a=C3Dk8TwHQYyIj7nOf9RCJw==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=7LH33tsxRIP6uNRhSrAA:9 a=QEXdDO2ut3YA:10 a=dawVfQjAaf238kedN5IG: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-01_07,2026-05-28_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 adultscore=0 lowpriorityscore=0 clxscore=1015 spamscore=0 suspectscore=0 impostorscore=0 phishscore=0 priorityscore=1501 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2606020086 From: Abhinav Kumar dp_display_disable() handles special case of when monitor is disconnected from the dongle while the dongle stays connected thereby needing a separate function dp_ctrl_off_link_stream() for this. However with a slight rework this can still be handled by keeping common paths same for regular and special case. Signed-off-by: Abhinav Kumar Signed-off-by: Yongxing Mou Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/dp/dp_ctrl.c | 19 +------------------ drivers/gpu/drm/msm/dp/dp_ctrl.h | 2 +- drivers/gpu/drm/msm/dp/dp_display.c | 10 +++++++++- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.c b/drivers/gpu/drm/msm/dp/dp_ctrl.c index 002141a02073..d0c5ffb907e5 100644 --- a/drivers/gpu/drm/msm/dp/dp_ctrl.c +++ b/drivers/gpu/drm/msm/dp/dp_ctrl.c @@ -2599,7 +2599,7 @@ int msm_dp_ctrl_on_stream(struct msm_dp_ctrl *msm_dp_ctrl) return ret; } -void msm_dp_ctrl_off_link_stream(struct msm_dp_ctrl *msm_dp_ctrl) +void msm_dp_ctrl_reinit_phy(struct msm_dp_ctrl *msm_dp_ctrl) { struct msm_dp_ctrl_private *ctrl; struct phy *phy; @@ -2607,23 +2607,6 @@ void msm_dp_ctrl_off_link_stream(struct msm_dp_ctrl *msm_dp_ctrl) ctrl = container_of(msm_dp_ctrl, struct msm_dp_ctrl_private, msm_dp_ctrl); phy = ctrl->phy; - msm_dp_panel_disable_vsc_sdp(ctrl->panel); - - /* set dongle to D3 (power off) mode */ - msm_dp_link_psm_config(ctrl->link, &ctrl->panel->link_info, true); - - msm_dp_ctrl_mainlink_disable(ctrl); - - if (ctrl->stream_clks_on) { - clk_disable_unprepare(ctrl->pixel_clk); - ctrl->stream_clks_on = false; - } - - dev_pm_opp_set_rate(ctrl->dev, 0); - msm_dp_ctrl_link_clk_disable(&ctrl->msm_dp_ctrl); - - phy_power_off(phy); - /* aux channel down, reinit phy */ phy_exit(phy); phy_init(phy); diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.h b/drivers/gpu/drm/msm/dp/dp_ctrl.h index 1497f1a8fc2f..5d615f50d13b 100644 --- a/drivers/gpu/drm/msm/dp/dp_ctrl.h +++ b/drivers/gpu/drm/msm/dp/dp_ctrl.h @@ -19,7 +19,6 @@ struct phy; int msm_dp_ctrl_on_link(struct msm_dp_ctrl *msm_dp_ctrl); int msm_dp_ctrl_on_stream(struct msm_dp_ctrl *msm_dp_ctrl); int msm_dp_ctrl_prepare_stream_on(struct msm_dp_ctrl *msm_dp_ctrl, bool force_link_train); -void msm_dp_ctrl_off_link_stream(struct msm_dp_ctrl *msm_dp_ctrl); void msm_dp_ctrl_off(struct msm_dp_ctrl *msm_dp_ctrl); void msm_dp_ctrl_push_idle(struct msm_dp_ctrl *msm_dp_ctrl); irqreturn_t msm_dp_ctrl_isr(struct msm_dp_ctrl *msm_dp_ctrl); @@ -46,4 +45,5 @@ void msm_dp_ctrl_core_clk_disable(struct msm_dp_ctrl *msm_dp_ctrl); void msm_dp_ctrl_enable_irq(struct msm_dp_ctrl *msm_dp_ctrl); void msm_dp_ctrl_disable_irq(struct msm_dp_ctrl *msm_dp_ctrl); +void msm_dp_ctrl_reinit_phy(struct msm_dp_ctrl *msm_dp_ctrl); #endif /* _DP_CTRL_H_ */ diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index cf859f880943..b8dab3f8a7c2 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -714,12 +714,20 @@ static int msm_dp_display_disable(struct msm_dp_display_private *dp) if (!msm_dp_display->power_on) return 0; + msm_dp_panel_disable_vsc_sdp(dp->panel); + + /* dongle is still connected but sinks are disconnected */ if (dp->link->sink_count == 0) { /* * irq_hpd with sink_count = 0 * hdmi unplugged out of dongle */ - msm_dp_ctrl_off_link_stream(dp->ctrl); + + /* set dongle to D3 (power off) mode */ + msm_dp_link_psm_config(dp->link, &dp->panel->link_info, true); + msm_dp_ctrl_off(dp->ctrl); + /* re-init the PHY so that we can listen to Dongle disconnect */ + msm_dp_ctrl_reinit_phy(dp->ctrl); } else { /* * unplugged interrupt -- 2.43.0