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 3A7743D16F9 for ; Tue, 2 Jun 2026 09:12:32 +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=1780391554; cv=none; b=jkMXqMYph1Sf4zxuRYofpyx8i1J3+sEJH7dmSUPGfIlbhpQZKECrMtlABKH3mxVV3sESLu1sMrHWnkicDiHSEm1esz82peAZXnvfTRmg4ayRFO+Q3HqRK82rUpoL0Me4YYN2Vmgu9+oPThRexGu5nDH25jRQwZAxZe7muwxXo08= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780391554; c=relaxed/simple; bh=da4DiLmkH54vMKs4+UHrFXYyvX9aCG9OfWIw37ym+Ew=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=leDcSxsx61G7E5z/+bjQLpSg/utEqlRRQHHTNai8O8Q9W08XkqpBIpA3DfBdCGyrc8uJ+7xR1l+62P+2EfxC6b8lazxPB/+sluFHyGtjmvtVgzdjzHxzcQSuxsdsMZ9PlCffrvCh5hkLyLs5SARPeJfepBjyzq4u/r7+yA/gvi8= 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=eBhbMY4a; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=bQ7xDYtO; 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="eBhbMY4a"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="bQ7xDYtO" 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 6527gi4k1638282 for ; Tue, 2 Jun 2026 09:12:32 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=eBhbMY4aeciroODC ciMEQgeG4o3hgcWsdrGbIzXENThOO9YJVvnDQqAo0ezoGf8S8Md1UWnacr/w4jWo JQTJG5So91z1K7YR3Vgp+J2wmP5KYffqRPQ9OYOoRJh8tkaFU7+O/TYNKA0ENib4 h47hzLobhlqUw3xR0nKc3kxqKTaEubVPNhtXQifhskY/Pb2K/gI7kh9dDYZ35Bxe kCnIuaKO4xU0ItxsSVquH5ISRmr0s5yxht8bpVDsBxrKvNetcYiZqohwLECJaDpd +1XbNTeZMysXuCR9qCeoUdpVpbaH/YCgJCOuPYSzPWXG4dotl7znhhivOiMCtGQF sfEz1w== Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ehu1cgc6a-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 02 Jun 2026 09:12:32 +0000 (GMT) Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-8ccf62978bfso71249256d6.1 for ; Tue, 02 Jun 2026 02:12:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1780391551; x=1780996351; 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=bQ7xDYtOu4e0DmdGrFc4XrABzx4QQ3E7+yJb1L7rN5QjaSBTF5PJuNZwzQtV6QSGdZ 6LKx3/Vyj+RzepqaElNjLCskJzM57VNCHeGfCPpaLgGyH+XPMAzel05q0SuPzUraagIc XuK/Ii5aClvI/1uIKMRXgrEGd5mllAayyPRAxBTa1AvH1gWMaFdnY9+zxAdQd2l4BPQx 6RDASSCnXFTJO+o8CLUfiD9GfVTC0p3aHsubcVoOHpTBNRi1gUPlfBNDHqYWFL+serBy nASDDkLM6PuMEQqRbq6UqenRF5Ge5pDOlukmPnwVsVuohgmeZVCM3YkCaemP8Y7Ya954 Yquw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780391551; x=1780996351; 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=liUCE6u8oQ6V/bwE+KNEc71FFAA4jKOKRE7FTv9Fyzs02DvI8yzmp1tQGUm6IJ4qih fAYCfUgaCBu6PN/YYz4zOez0gTWn+ztmruvPVN5VAhekjKfZlZMaIf09Ok5bXB0CBZn/ r2XpCVyGax83BTFuBi6B9QP/GrD9gJMPKNJswWbLPZfs2xTs5W19W6wiRY0X8GoKWbZi VfwJzfc80XiRxp9Bm+8EWy1ms46Gpp5ZBVAHYmWQFOkk5wZVkacPA7jIwNoabfNX40WB merP4fclPHQ47zuwt3hazUOGpV7D6+rg6H2cbFu/9aLE1u7sSa78xenSdu4RUZt6FE0Q ruMQ== X-Forwarded-Encrypted: i=1; AFNElJ/D4OS6QHTTq/8d/ygYwAmiTpb0xuLHs3CJEPsfoVOMoxFopxtg369ShUAEPNOff60TiIbmlxy0sCYOmv0=@vger.kernel.org X-Gm-Message-State: AOJu0YyLA+Ykw7q8iJcaUhveuFQMHsqjdPnbQ1WB8/T8zMuWw3nHUlWZ PPGyY9YHAObi+kcfrSIx/fQIjQ1zLIIhKfVx3gkaBGwZyQz27+KOd9uIl5Nbm4JH5IEt4aOeSS+ AOaxfGMu2w3lE0TJMcQEuXOPCVPd94eMn4BAkSmDybW8BhUmczhGFyEMIFgaXNY5cfJI= X-Gm-Gg: Acq92OF7MYX1LlU+j1p6Smotj8jmYsvKu3W546ekH8dDLxr1hijVvGaTdMMM2iHS9qU QztWXfLJW7wJxlGLxMcfuzDcpyJRnEazwp/NYqjgsplLgoAGkabB1kS5eF1BmJqf8pAaR4raZ6M qVgxFOxBw5aBzXQJOrtOA5K34T/0LPf769gQ6XIwMrp+WrBhDW+DNsdmJZV8AjiR+mTP+HyeCmM mLUL2nlRiz+Tz/mhnJ+o7V6mXd+m5Sh/fkjY8T6+I5KFoNYBKp+VtXcVFURzUxDQsO2C2GrrkX3 /PTCXK0UiZ2Qnbdxqa//rhLRmO4QTXJed+q3Yw6mKb+O9wwUaAGMeo+ViaQzR2qpIFRhwpmCvmt NsnPrrEVK77Q59lWSxu59fJPfmFnQOCxaF25MGEbb7Vq93QaEvoB1b56uJTJrtix1NHlvqICSyN WC30jo7vE4nqunn/qg4Q== X-Received: by 2002:a05:622a:a6d5:b0:516:de98:b670 with SMTP id d75a77b69052e-5173a935333mr173922381cf.39.1780391551279; Tue, 02 Jun 2026 02:12:31 -0700 (PDT) X-Received: by 2002:a05:622a:a6d5:b0:516:de98:b670 with SMTP id d75a77b69052e-5173a935333mr173922081cf.39.1780391550806; Tue, 02 Jun 2026 02:12:30 -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.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 02:12:30 -0700 (PDT) From: Yongxing Mou Date: Tue, 02 Jun 2026 17:11:26 +0800 Subject: [PATCH v6 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: <20260602-dp_mstclean-v6-14-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=3743; i=yongxing.mou@oss.qualcomm.com; s=20250910; h=from:subject:message-id; bh=PejPis5lPUmTa0t10X2rGcGnHfGkWszn1oUEuwhLLv0=; b=I+18ZOiJ7T4ONemocEPsWLpHYt0H8WenXnbhVc6cN2xPFnXd5W9vUP4XU5Q4tlH8EdE14UKkY WrAY17QYSsIBRzi2C83dmPZfd1OI9JGrW1Z8NpFjKazrt8mnysyNXsD X-Developer-Key: i=yongxing.mou@oss.qualcomm.com; a=ed25519; pk=rAy5J1eP+V7OXqH5FJ7ngMCtUrnHhut30ZTldOj52UM= X-Proofpoint-ORIG-GUID: q4NpRDzwQD6fO6080qkY5MI3OU6oYXd- X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjAyMDA4NiBTYWx0ZWRfX74Omy9n9vJOQ eN7ye4xhaZBFxQh0by+HA5tQNOp1dqGaxrqAaZTbmqF9yG/CmBRqoKjlNmS8tT/IJ5fwapjUDnx nR38bnawKvriX4c2PIZencEkY5ZsDstBnZqfYP76zfqXBSX0nO2YLIV0O1wPuRHoiTJg/s1lG0T u9DKRPUO7iDg1rU4IJzOUwEmKrX2UNmOWkMgtFbe6aLUie4hxjt/2tfWN2QLo6WQdFCQsPnjVY2 6Zk5WCcDYqmXYg8FMRGpWFfrQsHpvG9ZN8OKLuAhrVQ/xNylVmUrNxON3x9wVBAlrHredhhQ1Br Pe+yv6O+D/qPVkXAduFHx2+SLrYkVCpcjsrHqOx+HQQw/vdRo6r9PAswloxuZ2Uu6T4lfYhra/l zmzte3r9+X02c9ssbxsYK5XqJ1y/Y83McqHhgnPWOXzpnb/q61RxSKHhXtgfzHKxpi0Lr+0XoG/ wSBZqhydCj2B/RR5TRQ== X-Proofpoint-GUID: q4NpRDzwQD6fO6080qkY5MI3OU6oYXd- X-Authority-Analysis: v=2.4 cv=O6IJeh9W c=1 sm=1 tr=0 ts=6a1e9e80 cx=c_pps a=wEM5vcRIz55oU/E2lInRtA==: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=rHTcTV9uYuKpyGuOXCsA:9 a=QEXdDO2ut3YA:10 a=OIgjcC2v60KrkQgK7BGD: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 clxscore=1015 suspectscore=0 bulkscore=0 malwarescore=0 lowpriorityscore=0 impostorscore=0 spamscore=0 adultscore=0 phishscore=0 priorityscore=1501 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 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