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 9EA6E3B6366 for ; Fri, 10 Apr 2026 09:34:54 +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=1775813696; cv=none; b=SEzli5OcmTmsv2rBqER5E3TmIR8FKQzGHT3VL47ijiaieciykM6nogBeP1GazyAEJ/o6F5wDQxn1yOme42fnXIVsLGCy2HcJMawXGUfRk0nFfCbP5oQTLkDW6PG+FZ1KJVfo4z/x5n14dWWLrbfvgTjB5XUjQKXUqkI+o9GRTxY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775813696; c=relaxed/simple; bh=JNIUFKBZSN04dJuRppY93THtPJzi2gAdHsVCbV9Yi2k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VQ63PBqQGBU9FdM3UxCrYbaMZqaA8bZF6Z2Wvx6aCm/ocwOGJZOyB1YdubmG/DtPon+mTizx1HDvjqYLbHypGE4W0vDug0opbAhLNpt7x6YVfgJvzU73L/vq46H4fVsv0V9cYb4r++XLZ6HYQin0pVcNDcIqLza//wAvLq1g8J0= 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=VoCuc0cm; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=gnrrad5W; 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="VoCuc0cm"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="gnrrad5W" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 63A6nshK1729932 for ; Fri, 10 Apr 2026 09:34:54 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= LIVCULP6f3HK/Zo4P8FgktdYCIL1UYcA7HDOut07rlw=; b=VoCuc0cmmAoDgzIQ hOY+RdxocBZih2ODnLxXUZMezH2C+qMLKWnj1mLY3qPYzp44NgI2RcJdFe1hdjpu wOguQJgdPag8EAqZQv4KFJ8i/I2cuTS4/vM2qRwxUIgI6eqX8cg8YqQLoP8Dyifo tQtQ1KYPRP2GJtaqQxO8atSl60O6Ogp7Rdper0BdtSuh0KFEcRMF35yaYpwiJJRX L5poJXb0uGw0Uv7yiSJajuioID8uG5fYi60XE3COuCIHc+EtXWgmxc8w3NjESmrJ 533t926kzc6nx+AU+C6n5dfeGC1c4B0R8bsYgCiHne3boHOrFMakB4JkanJYB3q9 sFTm9Q== Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4deckxkn3d-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 10 Apr 2026 09:34:53 +0000 (GMT) Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-89cc1d6dbe4so48747836d6.3 for ; Fri, 10 Apr 2026 02:34:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1775813693; x=1776418493; 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=LIVCULP6f3HK/Zo4P8FgktdYCIL1UYcA7HDOut07rlw=; b=gnrrad5Wx/HtGgC8UEhco1bWVyrNQFwsPmCQTCv11HAFGwO3kuESmD8urvQ5640a2P A+HJ9SlLZTYi/8fvQU57bJWNsHxiPiOiZGmmMJSQrYgiHcsdYwc/oQZcnKYPXqnRm/SN t0gFfInTzHKo7orBd69fX0KGJahZdoFLydKuPvifiXSEEPLT9Q/crrF0BERywajgWTTx KRfQ9n2o24JIyFEeQzOl26QT3+Vu8f/OZWUFJt4T8zQAKKm5Q/Bi+G+0xduC/6o17Elv 22WjpgYdmbaiT7474jwVQudlJMd72U5CVav7OSZzD4Fjn8R2ZJWXNr4p4dqQVgNtT/hA 2R6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775813693; x=1776418493; 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=LIVCULP6f3HK/Zo4P8FgktdYCIL1UYcA7HDOut07rlw=; b=gjHChm5Z0f8q/uyZ4AgRcta70iKKC64To/YySMZ77FAPVVUHvnGlsjwyZ4z8/H2kvd jZC9vLjhuu7yp8HkQQgeEi6UL6d/nRJK1LDx4nx88is9yBq11+mlGfyfYvhTIoc4tepx DSq4AdIT1GY+PP79oQyJfz9g5tpDNiyyMoJPExhdvT8Ocb5RD/qS+STcvFhLTmINbIgf /bP70AcF4FkoaL+B67z/FRO00U0Q9MIAIgOMVV96yM6DkEUaaXjQnPmJ8r6V3fRReydp zskK3x8l/4xZX8XPLx5oL08wZQMkeg1N5hHSM+H+cV8IZ2xSL14x71g8SCGFK+vzhtux MVPA== X-Forwarded-Encrypted: i=1; AJvYcCVxrrN6qxCBE3HaQ0baxCkrSM/HBTGpXxLEq5y1CIep7hAMmN991YBE/+Kt+6PL3b+NsgsWVWxJ3SY8j7c=@vger.kernel.org X-Gm-Message-State: AOJu0Yxb7XIBIMkck+ufg+cakCsakMOZXk7V1s8uDTW59d1tKIdF/zb9 Hf/F+8yg0WN8wjAi3XhrNjl7G9HNdYME9tN9VNSe6+l+TAKmzdFZ/1pmk3Df55vaEqJJ2za+UBj VYZtCeBoEtd3zlpUtldlfy98fC5QUh6XrtAPBT1TrNhUmJHoDSanTgniWq/CG9/7V8dI= X-Gm-Gg: AeBDieuZZ0SgduPcB2mDg/72xWPmP/kA44/fPlas6/nbGXIUoY0xGcYttXNEl4qdFDt KknGYqQiBJle5LMTfjuN8IBeUr/qs3/+sw8yjGpt3CvSb0fJRVlHwh30CoglwZac6vsJBv3cDYn RYdjYmxkEIPd6Ff/xe7qhURulSeTn6CaaAGkOSlpXljbOX/Hn1q3tN4Rcml02H8UYAqNaX3bWQI sHTJLxN2G6mtrC7jG6g8sB4C/8dQs38qrWsBBqEFHKJC1txLoSI2tiGqcVB2CJJO2d4HQeX24xJ jVmnC0NOwFu6cAivj4ew1kgyDXjS12asUfT345AP324O8gtw36SjZ877MQY0O8CrrBW0eDq6H9o 6oD2zvdDTWJ9VHv25yQCCDTlRn4Id4XqmNAd7MPT9JuD822xnxk60wBnbqaAkiL6SIOELKyoF/Q QjGaUn0tQ= X-Received: by 2002:a05:6214:3285:b0:89a:622e:d32c with SMTP id 6a1803df08f44-8ac8629b69dmr35344426d6.36.1775813692971; Fri, 10 Apr 2026 02:34:52 -0700 (PDT) X-Received: by 2002:a05:6214:3285:b0:89a:622e:d32c with SMTP id 6a1803df08f44-8ac8629b69dmr35343926d6.36.1775813692507; Fri, 10 Apr 2026 02:34:52 -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 6a1803df08f44-8ac84cb135fsm19223386d6.38.2026.04.10.02.34.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Apr 2026 02:34:52 -0700 (PDT) From: Yongxing Mou Date: Fri, 10 Apr 2026 17:33:47 +0800 Subject: [PATCH v4 12/39] 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: <20260410-msm-dp-mst-v4-12-b20518dea8de@oss.qualcomm.com> References: <20260410-msm-dp-mst-v4-0-b20518dea8de@oss.qualcomm.com> In-Reply-To: <20260410-msm-dp-mst-v4-0-b20518dea8de@oss.qualcomm.com> 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, Yongxing Mou , Abhinav Kumar X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1775813628; l=3667; i=yongxing.mou@oss.qualcomm.com; s=20250910; h=from:subject:message-id; bh=pkwt26S0f/FIReOg+I0P7xE0FOpdJns1n/b9bgzHXMI=; b=PJluU1DTZxt5z8FFbdPGJBxUuq3FcsxLc9wLsJPSWazZ2Jtrz1t7Z4BcwcAgE2nRWp4ABaJXi QoJh4NbQkuIDt7fOEupyYlaG/B7Hzn1L6d+9ZlRx7J1ujyz78Plz3l9 X-Developer-Key: i=yongxing.mou@oss.qualcomm.com; a=ed25519; pk=rAy5J1eP+V7OXqH5FJ7ngMCtUrnHhut30ZTldOj52UM= X-Proofpoint-ORIG-GUID: Lf-BZPIsgMwyWkpfa06T25uTky52ugZf X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDEwMDA4OCBTYWx0ZWRfX2YuzmmRtE1tV dlHmx18aXGWlFQn2tyir0TxjEKItxLltz00PDGZes2qxT8KUCUc79qL34/V4kB5L/Mh1qnjzRZN SFy0jcUwZVsJ/N7ZGxkAO8BuRdhHF5RGe8UoP4M39xZ9u/NiRCa56vt/mBwUZFBCMwua2zrky9Y z7eBR9iufAk0grng5AZENaqM+kXbGT3BsptboyyNIIlkyNzi9rbpzprmQf47S3nnymX1v9Q7DrW T9fOnUeVMfXMGwh+BPrZ/zZFh/cw4pFg19x2xDHOV/5kiSo1Y/qkVKO47FN2ppnHKK25q9BHoRC xRF2Hih41VejpymbSuJg45IXp/ClLMHqZ0gPf3ML0DuxGO6LU5esByKvGRmNxVmc5EXmV6Q288Y paS6hQ2teU9i80BsL3WncUT/AuAZGbbUi6MF+eXxh1bWrIRVKMvmOT6xcuVWVdbQ8MJvYqEqvjV /BPxufxqB/k6AyCtFyw== X-Authority-Analysis: v=2.4 cv=OMcXGyaB c=1 sm=1 tr=0 ts=69d8c43d cx=c_pps a=7E5Bxpl4vBhpaufnMqZlrw==:117 a=C3Dk8TwHQYyIj7nOf9RCJw==:17 a=IkcTkHD0fZMA:10 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=rHTcTV9uYuKpyGuOXCsA:9 a=QEXdDO2ut3YA:10 a=pJ04lnu7RYOZP9TFuWaZ:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-GUID: Lf-BZPIsgMwyWkpfa06T25uTky52ugZf X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-10_03,2026-04-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 phishscore=0 clxscore=1015 impostorscore=0 spamscore=0 priorityscore=1501 lowpriorityscore=0 suspectscore=0 malwarescore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604010000 definitions=main-2604100088 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 --- 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 c7dc861301de..32ad00e326ba 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -1417,8 +1417,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_state *state) +void msm_dp_display_atomic_prepare(struct msm_dp *msm_dp_display, + struct drm_atomic_state *state) { struct drm_crtc *crtc; struct drm_crtc_state *crtc_state; @@ -1440,10 +1440,16 @@ void msm_dp_display_atomic_enable(struct msm_dp *msm_dp_display, } rc = msm_dp_display_prepare(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 1a697fb305a7..295da7ae0047 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_state *state); +void msm_dp_display_atomic_prepare(struct msm_dp *dp_display, + struct drm_atomic_state *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 cb54d7e71f8e..0feb757e2db9 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