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 3D8E5405C56 for ; Mon, 29 Jun 2026 14:17:04 +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=1782742625; cv=none; b=UECn/s4vpltuxHKl+ASuGCBsGUOtQsec/11FmLLJZNSqKQgsUQ+YWI0YwsAKPiPi7RmPulPYqMLk9wdqsXLZlgUwNqEdrcLYIRIKwEOfxVzyOu/6JTdji2RJX36+93z8mAjHRqijytiMhu3r7D29AO166P/K5UjvLRPfApwY5MM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782742625; c=relaxed/simple; bh=b2i238VUI/AdKzoSuCKAbFa1dbTjNQRwjyN6xCNz0mo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=SZSL+f3BzhPaLokM/ZaxGFyI+P0KPWLumuWUvGJKV3Uu/CX66lw9aElqlbm3+gHzQ/uCNb9vOBwQIfqV0rHQLzVJHN3fFyDg34/ygxAWnXgGpAXulV/DLJQVYmuPhftgLVakyqrWScN1tiurH6NmWWZc/Zjr+BTg9eN/SMdrvjA= 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=HfxVIzRF; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=EM0PFznC; 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="HfxVIzRF"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="EM0PFznC" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65TATCNt2647678 for ; Mon, 29 Jun 2026 14:17:03 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= s3VwBumwCqEjd1GYUzP46GInRqb8UClCfWsUQZYOShE=; b=HfxVIzRFx73FAPkn ditk1xCO1diJU0vRJtCrnydiQExGXu5MQlI9hQFi2CakmktSyvJy/TPI4FajvrGl +XOe215R8NOlXFBMp/t6k4KNTpoigFdqeR21HTvNlxsYVm3zXtT1EFWKb1ky/0vw t/HfnWRilQ+mi3R9JSkdliH1yOprBCeSxyR8VYu8sdjX2FHMq5HVYY6N9hU8IMTQ Gic15XD5PQXPimrBMFfs7XoMvdRzb1W0btaqUaYBUeET0HbPW2KDW/iBZeis3Bql njcVXqyhMkz/ShPPXuuea+KdPMt5jsEW5eAiIffJ6zpCsvrzhHDDkPuqFbpDe3sf i7g/ww== 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 4f3kyjhp4s-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 29 Jun 2026 14:17:03 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-92aea0d801dso500481185a.1 for ; Mon, 29 Jun 2026 07:17:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782742623; x=1783347423; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=s3VwBumwCqEjd1GYUzP46GInRqb8UClCfWsUQZYOShE=; b=EM0PFznCEyP0LaHoA8Llh0kg5U/YcFje/dUJBd1HDKQ2N87LT7Uf4bexzixtLM1pp1 pXjyeAL7scryjo9bYPL/zi1KZy4fYqiZDSgTu/nat0BelC56yij/QmHsYjx7CRb+badO Kgn/R4ObVI6ptipfhbs7y5MdSC4ZsL2Ppdj96eqf9G6o4NOXEqlmOefcw+r4bUfn8ihG rVbgWgItgNxK6iGUkr8JIaJ1I7Vm7CrFovXXc1R9960tbT9gBshgzlrMFo2z024M6Ltz XoLRDvZ2lQT/ti+6Ay0+YTmMBQafk4mTHCTsZk/C/YRHIGoNIJktxSNDUPK48S4ZtnBX iISg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782742623; x=1783347423; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=s3VwBumwCqEjd1GYUzP46GInRqb8UClCfWsUQZYOShE=; b=RZLfIZe/+ewk20rax0+oEuQUas328pUga8umPlXY+Ehsu1fGhWmBx95b3X5XHtD6ak S9+RgPcOGcwZC67HBUICn/4knfPnwAPjr5WtGM1xleVe90anf1vXH2JEMGjIe7EMwEo+ 42DGZ5alj5GK29Wu4vCrgZnDtAwYeQAUUspFV+iybOIxSyYAljDwTiJe1Q0NMR8+fsUp 08+dGz1+G86Jb8B13G0XcOsSr8MSQqWvcoinbSRWLAJkOnbAw0C/IoXsvsfQoNL9k+R8 JI5ct5Vw1LomFrpzS7Mda84PbONPg9FQpmzFWomK5HHAdZ3xC2XVe7Q/UHhRW3Vo2Lo9 H20g== X-Forwarded-Encrypted: i=1; AFNElJ9jiG/bokyIupcpletLy2e6qH344ugKwvwB4jBlrGAu0O1IE+oGCsbkTDI7MKYDG+V86dxz1blGyeuLVRU=@vger.kernel.org X-Gm-Message-State: AOJu0YzCmbkfbkgK9zDXPzZEIYofdS37zeqFCcy4WiZdNXB3o8nzQ0pf ndzmMzbxe3aym5a7ZLpvDYDixJHbyr6Is6sFa9kDwYLJhAlboWz+l2aQAb1+1GqlK6mYKsilMz1 UraOhL6sTSofdtvLUBcdjkw6OdADMqsIRe/I5KThscdRMq2ctSBapgQv/EVoZ1XSwQcM= X-Gm-Gg: AfdE7cl1HssrG/3ZO7eoZWM/Jn9c2ZPH9auMKbnWUnwnINI/Q6R6Nb9MNMwRfFqhzmr eHzlRbEpx7cDOWSi0oVl/YW46kso9TOFm4QctEkMEz4sPm4LWG3kyCQ0L8iDapbmpem/d70//Hg wj8KIIp9pmtotUm7fq1JDSzd+2AjxAtQcGeVpLAjhcwsvEQ9cNU6Np114J/QoQLb+/Fj8xCSKy6 YCIi8FZUqT3r05dkoJI8+5LLjkHaB2KJU2OWXx2/HErXJ0lvxPRxs+rDuZ1CA2Mpjdhy8yu1LKl 8Y6E+Ya27AsU2yLv6a0ChKprLwGfnGXQk+XhurEYP/X52Inqi4groIxtvTpy7Th8RTYezN/ji/f m7730Nik9oD15G2NvOEE+r/9clkoPfJ/plDe32LLgWkvEtmhuOrGPHQ8gdvai+8iIA+01AQ== X-Received: by 2002:a05:620a:2301:10b0:92b:32d4:4ae6 with SMTP id af79cd13be357-92b32d46453mr1194425585a.42.1782742622570; Mon, 29 Jun 2026 07:17:02 -0700 (PDT) X-Received: by 2002:a05:620a:2301:10b0:92b:32d4:4ae6 with SMTP id af79cd13be357-92b32d46453mr1194420985a.42.1782742621870; Mon, 29 Jun 2026 07:17:01 -0700 (PDT) Received: from yongmou2.qualcomm.com (Global_NAT1_IAD_FW.qualcomm.com. [129.46.232.65]) by smtp.gmail.com with ESMTPSA id af79cd13be357-9260079070bsm2143165885a.40.2026.06.29.07.16.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 07:17:01 -0700 (PDT) From: Yongxing Mou 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, Abhinav Kumar , Dmitry Baryshkov Subject: [PATCH RESEND v5 22/25] drm/msm/dp: wire MST helpers into atomic check and commit paths Date: Mon, 29 Jun 2026 22:14:43 +0800 Message-ID: <20260629-msm-dp-mst-v5-22-2ed6aee1867a@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260629-msm-dp-mst-v5-0-2ed6aee1867a@oss.qualcomm.com> References: <20260629-msm-dp-mst-v5-0-2ed6aee1867a@oss.qualcomm.com> 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" X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1782742144; l=3337; i=yongxing.mou@oss.qualcomm.com; s=20250910; h=from:subject:message-id; bh=b2i238VUI/AdKzoSuCKAbFa1dbTjNQRwjyN6xCNz0mo=; b=igEgrzozdyLMzTrm2/ynfm9SDhtgOWmyL75SDtVtIh+KRvPdQR3TaKoFjqQI6DDHzD+QSGfVV xZh9vwij2jWCA9H1pOpUd8wGitlgUN+Tfo9+KwkSx3idfi+sI9CUtLA X-Developer-Key: i=yongxing.mou@oss.qualcomm.com; a=ed25519; pk=rAy5J1eP+V7OXqH5FJ7ngMCtUrnHhut30ZTldOj52UM= Content-Transfer-Encoding: 8bit X-Proofpoint-GUID: 6MkCRZ7iS7sWlQR_4yrFJO242ILMEKQE X-Proofpoint-ORIG-GUID: 6MkCRZ7iS7sWlQR_4yrFJO242ILMEKQE X-Authority-Analysis: v=2.4 cv=Ftk1OWrq c=1 sm=1 tr=0 ts=6a427e5f 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=ZpdpYltYx_vBUK5n70dp:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=rXwVWE6-aGP_zC5-gXEA:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNjI5MDExOCBTYWx0ZWRfXxWhaxp2WRYN9 hNRF9AeKFv61L6LNDyt+HY99vIuDzToghsTCmpXbzzEYm0bLsiy9T7oJI6x5ByxErWL3yN/By/K cguHdywFsJKuiHQBSNos+H81TkzH5xw= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjI5MDExOCBTYWx0ZWRfX0sGd+Ic/XdO1 fKBG1aQ0egly6tDC7OTmGC7yvY3OrlkIWpzNJk8cikYXcxFI0mvATmwyIrhD8sdyNBscS+Ejp2o yYO/cAoenvYFTACe41gnO49CnDiI+Bp8rTE3lNPWaAAaFXjTRoxDLc2U3fkNHpgTmbnjtK41OpU xEapKaaA8nrAiwPljb5Gb8NlvX4BkqwrWUUM7c0zhzmZjJZ4stFh5S9jC6wr5O1EKoYmHVZLo+B xb+IADKJGGXhherDw0DJiY0idv12CMEaHznkKGcUNyDHWa4okVWZ/aO91JwCPKgLspbggEYXaLs xBN8l21V8MNMbiGFeIZZVcXRn9xHJ+CdkqSC8EO9aqHDoyVIGoXgpAqJayNp+ixzXqwcNb0G6Zt Zdif4ORUHkXFo0d9+lIe2C6bF4bm6pk0RLqJrU9U2ZZ9gH0Mz5FBgeieqvsXGS9GZ/w+K7IsT0v GjI+ZDcIAb8es3wagJg== 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-29_03,2026-06-26_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 lowpriorityscore=0 adultscore=0 suspectscore=0 phishscore=0 priorityscore=1501 malwarescore=0 spamscore=0 clxscore=1015 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606290118 Call drm_dp_mst_atomic_check() from msm_atomic_check() so MST-specific state, such as connector and topology changes, is validated as part of the atomic check. Hook the MST helpers into atomic_commit_setup() and atomic_commit_tail() to support non-blocking atomic commits for DisplayPort MST, and ensure MST commits properly wait for dependencies. For SST, non-blocking commits are already handled via commit_tail(), which waits for dependencies in the DRM core. Signed-off-by: Abhinav Kumar Signed-off-by: Yongxing Mou Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/msm_atomic.c | 14 +++++++++++++- drivers/gpu/drm/msm/msm_drv.h | 1 + drivers/gpu/drm/msm/msm_kms.c | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c index a8babf1dbe0d..e70e5088cfe5 100644 --- a/drivers/gpu/drm/msm/msm_atomic.c +++ b/drivers/gpu/drm/msm/msm_atomic.c @@ -4,6 +4,7 @@ * Author: Rob Clark */ +#include #include #include @@ -207,7 +208,11 @@ int msm_atomic_check(struct drm_device *dev, struct drm_atomic_commit *state) if (ret) return ret; - return drm_atomic_helper_check(dev, state); + ret = drm_atomic_helper_check(dev, state); + if (ret) + return ret; + + return drm_dp_mst_atomic_check(state); } void msm_atomic_commit_tail(struct drm_atomic_commit *state) @@ -221,6 +226,8 @@ void msm_atomic_commit_tail(struct drm_atomic_commit *state) trace_msm_atomic_commit_tail_start(async, crtc_mask); + drm_dp_mst_atomic_wait_for_dependencies(state); + kms->funcs->enable_commit(kms); /* @@ -322,3 +329,8 @@ void msm_atomic_commit_tail(struct drm_atomic_commit *state) trace_msm_atomic_commit_tail_finish(async, crtc_mask); } + +int msm_atomic_commit_setup(struct drm_atomic_commit *state) +{ + return drm_dp_mst_atomic_setup_commit(state); +} diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index 963303079220..f71200a790f3 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -213,6 +213,7 @@ int msm_atomic_init_pending_timer(struct msm_pending_timer *timer, struct msm_kms *kms, int crtc_idx); void msm_atomic_destroy_pending_timer(struct msm_pending_timer *timer); void msm_atomic_commit_tail(struct drm_atomic_commit *state); +int msm_atomic_commit_setup(struct drm_atomic_commit *state); int msm_atomic_check(struct drm_device *dev, struct drm_atomic_commit *state); struct drm_atomic_commit *msm_atomic_state_alloc(struct drm_device *dev); diff --git a/drivers/gpu/drm/msm/msm_kms.c b/drivers/gpu/drm/msm/msm_kms.c index e5d0ea629448..33ab30300e16 100644 --- a/drivers/gpu/drm/msm/msm_kms.c +++ b/drivers/gpu/drm/msm/msm_kms.c @@ -29,6 +29,7 @@ static const struct drm_mode_config_funcs mode_config_funcs = { static const struct drm_mode_config_helper_funcs mode_config_helper_funcs = { .atomic_commit_tail = msm_atomic_commit_tail, + .atomic_commit_setup = msm_atomic_commit_setup, }; static irqreturn_t msm_irq(int irq, void *arg) -- 2.43.0