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 DBBE63F4859 for ; Tue, 9 Jun 2026 09:47:24 +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=1780998446; cv=none; b=KVJ6U7s91I1NR9JzPlJXaOiho+I2e1K4kDUuVS0qiY4Rx2L+Aq52pfCgQACpimLICrheIQvF8OM6ChqxyJOyQjIfHRR+aLiTTYroRFHJKITOngjX97S9nafhr2BO4J5981XfcPQIPjNnBzI6Mlh5jyhrf/Mx8p+rGZPpWL/yQO8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780998446; c=relaxed/simple; bh=69/u+u0bMmkeRYaYJHJOVRrxbMKLVJ/mmagPx2f0q9c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GAfWfsAuCTgelskw16WsBZzi/gVA0RXC4QTNG1UfDWTiCLosvaNiaSajO6K5COcYzsIiMo+BovcMkQMbtJdjuuWorjZOk3CKdPmHKegUDBSdV2lB8n+Mgy5+bPFO811Oz7eYvh3Dl4SzGmFnc0ggdW1Tl0xdIgrlXGg4GKG3eZk= 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=bcMbUK+F; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=AJiFGsrp; 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="bcMbUK+F"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="AJiFGsrp" 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 65985T4a006887 for ; Tue, 9 Jun 2026 09:47:24 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= gKV7eY6x0GdZCgdZALVmHOg4bVdpjbHHZgfJ+wEnO1c=; b=bcMbUK+FG6jhBOPc NdtnDvNFtKdCu3wqtOBvbd5FpdivZQsF8qJ5KpD6RY1ituoVJqt3/CCksejQjjue SNjeNtNKYc2viccLaMFp5fAADE9uH4SEQWoGnMxPMUDMnuTaAibDwNOZSIIVksLA fZnw4PkEo+Aqa9E8ZeuZKcacvx7xukeFUxShB5G/EW0YVa8PBMLE0b51PTC3IEdA 93fIPmB4K7ZIra2DTrbQUPp2otQdgNENkjr/ToljuC49gf/SqOrR3dGENJfuo+8A xDqBdu9CHOjOCfh7o0UFvlvVrvHm20HQWrNUz8KXZr9x9p45PjEPX09PRpjgvT6w Basvlw== 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 4epf0srdkh-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 09 Jun 2026 09:47:24 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-915b9dd020cso708807785a.3 for ; Tue, 09 Jun 2026 02:47:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1780998443; x=1781603243; 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=gKV7eY6x0GdZCgdZALVmHOg4bVdpjbHHZgfJ+wEnO1c=; b=AJiFGsrpwh3MYJjr7Wx35XQUDKYib4NsWqQdvw71Fi3lVyMYB1U28QQbkTlm6OOK4H t/lXDtPTU2zwgF7ZRq3h5X5oU/L6PQ32HZHEYaGSq8tqPCm7eF/A6ZLzn2KWM2D9ESv9 3C566R3qTCYiiyXV3Xnqb8nLdxg5XDJsRYiK/hslTqyhJpLYdcdEAVsnzXkJimv5RFyr 1/UYb4q43LUtnVQ18BKesjzrNAt3j1KRts46iwHAx3HbrfOystI70F5R+Jmlf20pVKk3 QmCPjGbUvcT9G09nEzgRVjc+aG5Fb6tuc04ZLkSj9oku4TucTVVCn0lL8mhe9PbevbOj 7Y4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780998443; x=1781603243; 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=gKV7eY6x0GdZCgdZALVmHOg4bVdpjbHHZgfJ+wEnO1c=; b=HZ3IEQWJihuU1XK0cL0o3IPIIe1Dr6i84gG0435EqGeHPn36SgFPpBQ+lOafUKq5x4 cci9RNLisQUfNYveD0ufp7fTqWmrMjnSBO9zCT6/an3ElXjA6eam7sgiOYopbkEzCsNX vGBkJcJ5HBpCXmgs8zTsS3qL3IA4KnNqZSTu1KPdnqrqntt905AaIgJGIN/5UlU5fSSe s8tYtEO6OXXifB3LEq/h54kt03NPMfDYPoeuhPi1SxbTSuGSn75U7Hfqk6OEOfTo0lff gvffpzcCyx0jIX7XwiFpIdy1PEFZxvmL+07IzZBJkAy1UIqIrpYUvllH3oqhQulzdBQQ TFTg== X-Forwarded-Encrypted: i=1; AFNElJ+y+4poRJfgHqwCVD7GiUrHvf3ixvXxzFLEbZInEblhNoWKFsu/BcMgIVwmBtL0CdOUkBp0m0G8vO9qOIA=@vger.kernel.org X-Gm-Message-State: AOJu0Yygvo+C6HvNOIO6tMLOcM94B6M1UOwG+KSYOD2MekWnKeUPh4St ft5t2wIWkYMHbUbk9Ji02W0ZN1y3CVb6NXelybAIIX6fB0MNRehZMuR6E+yvRqZ2zf88MIBxpUN jB4cZZGBLeBV5el45L7vC2t1vtPi2YhHBbwWCWYRUKh4cwI18MyhLgOtk5b3DU6xCN+I= X-Gm-Gg: Acq92OEVl0OyC9BEPhw41a1XOmIROEFrIii42DM6iG4cnAOKueJHmyS9du7AuZhFd1w pPRUqTlwc8RHhLHB/qIVbWCGTUdWzoaaljmx7HDfP6eoheOSvklpimV6mNR6SxOpYFzpmzcZQJM k+4iVy9iymECLj3aQPo60pEJpML/3sPpEgiv4Gn/XE/aH/dBmeftBOONdJ2fOWVVmph556bbx5i /ccqxnhkty1GWyf4YRX6qCdkIhITpX4RbO2OMLn59rL+wfPDc61J+9Xnrchhm4zh5DerxbnKi4w IE3Wm4xkNIU5nxoAScJpt9VQsX/atg339JuTI4SVc078jBgBPDVrc8v97ZiZVM9azLVGI2NlM5V SLjDv5waAKDi9jFaGb51+/G/ukQ4FKBNHTO+zJmdmwwjjD9l1+jmQDUTu1V2NzhP9i30dLQs5VO Q4h2H+GNKKRsXDdPppKg== X-Received: by 2002:a05:620a:3181:b0:915:e8fb:acc0 with SMTP id af79cd13be357-915e8fbbd51mr258056785a.23.1780998443074; Tue, 09 Jun 2026 02:47:23 -0700 (PDT) X-Received: by 2002:a05:620a:3181:b0:915:e8fb:acc0 with SMTP id af79cd13be357-915e8fbbd51mr258052985a.23.1780998442532; Tue, 09 Jun 2026 02:47:22 -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 af79cd13be357-9158a00afafsm2047489485a.2.2026.06.09.02.47.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2026 02:47:22 -0700 (PDT) From: Yongxing Mou Date: Tue, 09 Jun 2026 17:46:31 +0800 Subject: [PATCH v7 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: <20260609-dp_mstclean-v7-9-ea04113e8233@oss.qualcomm.com> References: <20260609-dp_mstclean-v7-0-ea04113e8233@oss.qualcomm.com> In-Reply-To: <20260609-dp_mstclean-v7-0-ea04113e8233@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=1780998393; l=3890; i=yongxing.mou@oss.qualcomm.com; s=20250910; h=from:subject:message-id; bh=IBykKglaoFNzwzYIynAYX/xNxF8GBX7vWe0UDGG9/JE=; b=3H9FfXTCb4VoYZS/ebi0VLBBMD2YLcwDaShY5OWsGKF3aQ574dbqjntxQT6BwaQ4rDhGuMf36 lh/3dFbZgM3Cml1zghEi4KrjuEX9heKx1rv9IqZtP1a77C9lbSuN5Nh X-Developer-Key: i=yongxing.mou@oss.qualcomm.com; a=ed25519; pk=rAy5J1eP+V7OXqH5FJ7ngMCtUrnHhut30ZTldOj52UM= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjA5MDA5MCBTYWx0ZWRfX4X6h6/szaN7O IH4j6J7HEONHkAUB2f/YWp22XDwSCQQ2NBi6+p2gp14wA1nnNzHOTAWcT11T/ZOVYT9WQIwTqvR 8AOo165lzCwOJdAN3bi/JoEUylB14ETJ+HY3k0xNTzMAInlLgHvPPGxtXdKiT14oL03LJuIYYhA nW62mpBv6H9026V22c82iCa1bn247yV5gle1EwXFhqPws58l+wKoCEBIDPOakV8pFADL74d5SDm Qxr5e0//HO+ilSXAU3E7E3gTpPZiwiG1AdjiRQX8ITZCIYlVvRtVowoxxV4FYGbtCBZMC2Wkw/v 9GSXB5B8+W54lok8QlTeD1pi4e+UT5HyWcZbBSrbdSb6OBqv64YFGSv9Mn4B6DyJDKHrFfUtLoC WhIolwiNjeLwGWMhRXSgPcp4sWBsp8aQJ8lT9kc2xnHURs4uNew+zC3i5VTXhArqzxKfd2k6rpK IAlszLnXb1qxUsiokew== X-Proofpoint-ORIG-GUID: 6kSTzpzFhNUO1COzyXSnx3N-E4NiPDZj X-Proofpoint-GUID: 6kSTzpzFhNUO1COzyXSnx3N-E4NiPDZj X-Authority-Analysis: v=2.4 cv=GeonWwXL c=1 sm=1 tr=0 ts=6a27e12c 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=Um2Pa8k9VHT-vaBCBUpS:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=7LH33tsxRIP6uNRhSrAA:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO: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-09_02,2026-06-09_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 adultscore=0 malwarescore=0 clxscore=1015 spamscore=0 lowpriorityscore=0 impostorscore=0 priorityscore=1501 suspectscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2606090090 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 546d899dde23..626b95d4d015 100644 --- a/drivers/gpu/drm/msm/dp/dp_ctrl.c +++ b/drivers/gpu/drm/msm/dp/dp_ctrl.c @@ -2598,7 +2598,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; @@ -2606,23 +2606,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