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 28DE33BD651 for ; Thu, 28 May 2026 10:41:45 +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=1779964907; cv=none; b=KSwoJwGGX+DKnWLa24RQFB+L/sS+ttJ9pU2lEQQ38vuR3kJZ+kKSLhxGYYP3ScYZF/6X8kWLCK4veYsct+bpxnt4eRFBK7om2pTguVxL/FwfjW6POOquv9IMje2h5Z8ooxMlVSVE5kiUH34vopeERIvXJUmvPZXt55X9FwyFhfI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779964907; c=relaxed/simple; bh=da4DiLmkH54vMKs4+UHrFXYyvX9aCG9OfWIw37ym+Ew=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LeZX6/52ZkGVA0Dpu8v3gkbQ4u2asrWrQgBW9KItvrNyTkKa6hi5ivAVxNpvOGNT3wJPaQJEHWFIYxisvSwyOjRq9TfO4TGb5fBT870JvVgoD8Nv00W+u4dauc9rRpvNZuzIIws3UqIWans7a0Uwp1+0CchKq0rajoPiF+kZwn0= 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=dc3ZTpNg; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Hf64Rb7s; 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="dc3ZTpNg"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Hf64Rb7s" 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 64S8vcOw566560 for ; Thu, 28 May 2026 10:41:45 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= 4GLG60vKqqPhXSK9u7LFSK5eRlVCZiWpAvGD6R5I4zI=; b=dc3ZTpNgc1bGQzBj fBceIuLclGs2lQim5PFenS2kNss/UODOsqFCMgpUZ51ldg9nb6Sg5iz7MWeHY2DV F/TyC705LorPh6QKm5jkP4k5no7PTIq0H/ljtCd57Hu+ZkU9a7z2yo4MHO+eLpwa 7J9a2FP6zNRKWk1OzwSmvpWuquhpvTOT1OU3kLWVG/yPuAPRooVbXMmvtCl2lbxB K9y7ZeNZYJlfGURFkC6LE9Gffbi/y3i7h5IoWIAkbUYVK3+161Raw/woUfUrsjyY HyQqw9ByxIQcycgW6vOTc0KO/GOg6aiBl5ynSH2zNQ5rkOo3ouydrPmJIe0RwFKE yuABCg== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ee7ynjdb5-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 28 May 2026 10:41:45 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-9112b2755abso2826605685a.1 for ; Thu, 28 May 2026 03:41:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779964904; x=1780569704; 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=4GLG60vKqqPhXSK9u7LFSK5eRlVCZiWpAvGD6R5I4zI=; b=Hf64Rb7ss6UqbDSc5Rw1gegOIjcmvfoMZZVYBrw+zLup+VB98it8MWc++Ka13ESn4C gYgpDhB8HrntY6ZrN+YwloAlnQGA0nxMYCswDtJn7vh1kX0kJ0KP4J1X1bw861f5cUAt OhUTL08MUYeHoB9R/HCiN47d8JUhsQzATTlEeg9je19rMMGeh/Ywu2Oj7/odyPAksA4j yfvpGjpwHZQkUt1uOtFcRS5JMPvL3fjwwsvaXkvOqwh9fS579EbMdEPNz++PvRXrCYez wV2+MitJ9KH1/pD/Ax0CrFbZuIq55K1NL03BF/LHZ9mEVFOyGwz7RDVY3iVGF7AbbTbg d+jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779964904; x=1780569704; 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=4GLG60vKqqPhXSK9u7LFSK5eRlVCZiWpAvGD6R5I4zI=; b=K13zWpd/quhKWxYXQoZth5lFJEKWi7JX5phRhVKlRO93nDHHXutPplkSwqHEP5X80+ 64SG/+Nx+7XDssYvjDNdLqOAZDpvUsRpHy7fjxtyjQLLcOv+U0k2LLaOUfFNGMiVR16v JEVUNNrp7Sb+h+bxrYhZfjRmjW0tiFHwByL7Ocx8A9xBYUJzPS0HvlW/OYNLgYIQuJJ9 68CZpWLGapJ6/qhw7ScxKjznEcaflt4D0ypiAHOvVy1Y3SwE4fn0RnrXhGF6PKK1kGce A4IRnq+KzaYmmZZ6kpwS/IPVO+S5aJZWElrkESvDCwLujRSZwHUYN9tKXV59uPV5n9WL 4fbQ== X-Forwarded-Encrypted: i=1; AFNElJ8/Cesv4KTU6l2FcXgnbQAvvrg2xb/liXGjaTnKw0BpfZ8YyGV7G1xJs0RmQ+E6+XXlMDOg6WBqyRzIk6M=@vger.kernel.org X-Gm-Message-State: AOJu0YyhBsgykE80XtjE4vdgQzCHh9OSkiqXLuOqIrfcf6L+szaI/GJ6 MjQqz9Cs5v8dgBp4+1YHR/YqmW5BhXUZ2dR/s8omZ9sw75VL2Z8p8Skpu20UYt8kIiDUVEj/51+ u4BJ58mFPtiu38iJWBBCJnfAaygF1G8DQVLsxGKGJvbOT2NS4Vs0vkioEOuXIQACR5hI= X-Gm-Gg: Acq92OGugfQxbJ7kQ2LHBmB2hkp2OWZC4LJsKbYASYZyNjE6nDyD5R16y/fSEGJ4VMm MCAd8FLO+a78kI8LF/E2P+QwYcq8wdiCVILV6uJbWqCocTMKyMhjoNUHEzl7vO6i127BuYwIfzD M+4bSzmfex0J5qYce2LCGetAevXs8hHePeMxHo8Y+ev5OxiEKgJcbWh5F9QgBQB7bqbExtoYr7L QF6QA+TCQtR6F1fxu2MfgrCg3sdKRvEaSTZWqtTXnA+vJtWGi0RwvjzTmtyvvXwCi+mmJW9FA7P /VT6KfmDo23bADp7osOhTX6nibbyisri6lfp5Xgt+kz94IUI5S/dRzFKgiTehBHmKuWbNneS9tV hp5QjBgCRVT98z1MNmXiVHZSvWrURGsFnnGEiCnr5DedBWb/xOGdyavbEGufSmoiND9x+wuWy21 n2ncsrBdJ+/nJTEPh83g== X-Received: by 2002:a05:620a:2989:b0:8ed:11b9:1edc with SMTP id af79cd13be357-914b48d1d5fmr3948320285a.14.1779964904441; Thu, 28 May 2026 03:41:44 -0700 (PDT) X-Received: by 2002:a05:620a:2989:b0:8ed:11b9:1edc with SMTP id af79cd13be357-914b48d1d5fmr3948314785a.14.1779964903987; Thu, 28 May 2026 03:41:43 -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-914f86fffddsm755148485a.12.2026.05.28.03.41.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 May 2026 03:41:43 -0700 (PDT) From: Yongxing Mou Date: Thu, 28 May 2026 18:40:35 +0800 Subject: [PATCH v5 14/15] drm/msm/dp: separate dp_display_prepare() into its own API 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: <20260528-dp_mstclean-v5-14-a9221c1f1f3b@oss.qualcomm.com> References: <20260528-dp_mstclean-v5-0-a9221c1f1f3b@oss.qualcomm.com> In-Reply-To: <20260528-dp_mstclean-v5-0-a9221c1f1f3b@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=1779964831; l=3743; i=yongxing.mou@oss.qualcomm.com; s=20250910; h=from:subject:message-id; bh=PejPis5lPUmTa0t10X2rGcGnHfGkWszn1oUEuwhLLv0=; b=XAghNErOj5Q8+qQKxC2vyn/619TeztHoHxIqNc9crazWw1iU4EdyZh0ib+n4zg356QVgcl4GW KX+FfcvqeHTCfqvEMi1mP5ezwrB/wPUykqMuc8XD7kHLA6Wl5Q2FScK X-Developer-Key: i=yongxing.mou@oss.qualcomm.com; a=ed25519; pk=rAy5J1eP+V7OXqH5FJ7ngMCtUrnHhut30ZTldOj52UM= X-Proofpoint-GUID: tVWCvtGu-YpK93yC5nyL74RXte9Jh7dz X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTI4MDEwOCBTYWx0ZWRfXyysTi7BlrIfn 2l+YPaGp1jeaJozNKdsR8CNUaneZZiW4cCmy4vXxc/nC1IAHBgYQQvTybPViC5r7X85xBuBQO4v If589ZizT0lpFfseYL61GTXoL6/jUYfz8fDiW3ccSckWZErSbPs2hPjJyNOr+GKttG0mf5H4A7C w4Z2qScLfjqctuj/TfbY9TyHqdCqHVEI3WfYE0RwRKk+q0eQFM+Yl+QaybCGihxaJ3CEuon/Cg3 kkCN1ZOJfo1AqhNhqTv69aWIMefXgdm3o7TP+aW9U+mT+h/1c8cKmTuLL8ehEwb7Ih+cNDIIbit 9vwhgaLD6ocXtczNQ08rhS/cnvEZuINAjQMdwDBHjcv8qb0d6iMwozq5kOTthmvQwJWPDC2LSiQ 5E8cb/M/Ix0BuaQHwkK5TgUkQi+yTBIpRVsIUgoKUwdIw5EnuSl9xy2Z2GNnhennWo30akgGngW ELRi5pIG9sVB+GiRSSA== X-Proofpoint-ORIG-GUID: tVWCvtGu-YpK93yC5nyL74RXte9Jh7dz X-Authority-Analysis: v=2.4 cv=Eo7iaycA c=1 sm=1 tr=0 ts=6a181be9 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=C3Dk8TwHQYyIj7nOf9RCJw==:17 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=rHTcTV9uYuKpyGuOXCsA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O: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-05-28_03,2026-05-26_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=0 suspectscore=0 adultscore=0 spamscore=0 bulkscore=0 lowpriorityscore=0 malwarescore=0 priorityscore=1501 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2605280108 From: Abhinav Kumar For MST, the link setup should only be done once when multiple sinks are enabled, while stream setup may run multiple times for each sink. Split the link-related preparation out of msm_dp_display_atomic_enable() so it can be called separately before the per-stream enable path. Signed-off-by: Abhinav Kumar Signed-off-by: Yongxing Mou Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/dp/dp_display.c | 16 +++++++++++----- drivers/gpu/drm/msm/dp/dp_display.h | 5 +++-- drivers/gpu/drm/msm/dp/dp_drm.c | 6 ++++-- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index 2d5ef087648c..cd1f2899b733 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -1403,8 +1403,8 @@ int msm_dp_modeset_init(struct msm_dp *msm_dp_display, struct drm_device *dev, return 0; } -void msm_dp_display_atomic_enable(struct msm_dp *msm_dp_display, - struct drm_atomic_commit *state) +void msm_dp_display_atomic_prepare(struct msm_dp *msm_dp_display, + struct drm_atomic_commit *state) { struct drm_crtc *crtc; struct drm_crtc_state *crtc_state; @@ -1426,10 +1426,16 @@ void msm_dp_display_atomic_enable(struct msm_dp *msm_dp_display, } rc = msm_dp_display_prepare_link(dp); - if (rc) { + if (rc) DRM_ERROR("DP display prepare failed, rc=%d\n", rc); - return; - } +} + +void msm_dp_display_atomic_enable(struct msm_dp *msm_dp_display) +{ + struct msm_dp_display_private *dp; + int rc = 0; + + dp = container_of(msm_dp_display, struct msm_dp_display_private, msm_dp_display); rc = msm_dp_display_enable(dp); if (rc) diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h index 5116f7bbbd02..43ed79093e24 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.h +++ b/drivers/gpu/drm/msm/dp/dp_display.h @@ -35,8 +35,9 @@ void msm_dp_display_set_psr(struct msm_dp *dp, bool enter); void msm_dp_display_debugfs_init(struct msm_dp *msm_dp_display, struct dentry *dentry, bool is_edp); void msm_dp_display_atomic_post_disable(struct msm_dp *dp_display); void msm_dp_display_atomic_disable(struct msm_dp *dp_display); -void msm_dp_display_atomic_enable(struct msm_dp *dp_display, - struct drm_atomic_commit *state); +void msm_dp_display_atomic_prepare(struct msm_dp *dp_display, + struct drm_atomic_commit *state); +void msm_dp_display_atomic_enable(struct msm_dp *dp_display); enum drm_mode_status msm_dp_display_mode_valid(struct msm_dp *dp, const struct drm_display_info *info, const struct drm_display_mode *mode); diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c index 6b8923d9dff4..4bf1a5b7c3f9 100644 --- a/drivers/gpu/drm/msm/dp/dp_drm.c +++ b/drivers/gpu/drm/msm/dp/dp_drm.c @@ -55,7 +55,8 @@ static void msm_dp_bridge_atomic_enable(struct drm_bridge *drm_bridge, struct msm_dp_bridge *dp_bridge = to_dp_bridge(drm_bridge); struct msm_dp *dp = dp_bridge->msm_dp_display; - msm_dp_display_atomic_enable(dp, state); + msm_dp_display_atomic_prepare(dp, state); + msm_dp_display_atomic_enable(dp); } static void msm_dp_bridge_atomic_disable(struct drm_bridge *drm_bridge, @@ -152,7 +153,8 @@ static void msm_edp_bridge_atomic_enable(struct drm_bridge *drm_bridge, return; } - msm_dp_display_atomic_enable(dp, state); + msm_dp_display_atomic_prepare(dp, state); + msm_dp_display_atomic_enable(dp); } static void msm_edp_bridge_atomic_disable(struct drm_bridge *drm_bridge, -- 2.43.0