From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BE8D0F3ED6A for ; Sat, 11 Apr 2026 23:51:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C02F710E254; Sat, 11 Apr 2026 23:51:26 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="TVCP3bh8"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="alJ8UX9G"; dkim-atps=neutral Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by gabe.freedesktop.org (Postfix) with ESMTPS id 16BCD10E254 for ; Sat, 11 Apr 2026 23:51:26 +0000 (UTC) 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 63BJqgFm347136 for ; Sat, 11 Apr 2026 23:51:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to; s=qcppdkim1; bh=3oJOXl83w5zIKf4SQrANUMBi 1ywOW39XvkHlHjGUHtA=; b=TVCP3bh8Pnd7mX0fAuFTfr39ezaQVSCSedeQEOQe syvMjL6vFKorUgVtl2oJhcwDgQMelk0tj7hYgraM688QjNQvE+whOStnXrdcZgE3 x7/SsYADmo1XMK8hdOc/dga3CTTJCMg5k3l6T3pgmAa7BC8EnWCs0aZx/lqmYaiw g3GUhu6qyF9Kdz0N0bMXmI+lkFT+X3nXeU90n+v60qKa4IlmBV0hzNWJ8inf4jKR WkFp7cRrVzbtYAW/egNh9RGGLRRrPNR6p6kD6UWCyOpGEom181K5NCXMP2qQMzAa Uyz/VVM85KMUb1Yais0TYfxlmcuq/OM50eONcWcNdS0gVw== Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4dfeyyshjr-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sat, 11 Apr 2026 23:51:25 +0000 (GMT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-50b4b81c632so16847721cf.1 for ; Sat, 11 Apr 2026 16:51:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1775951484; x=1776556284; darn=lists.freedesktop.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=3oJOXl83w5zIKf4SQrANUMBi1ywOW39XvkHlHjGUHtA=; b=alJ8UX9Ga8uS7ZF+cb9i4Yk3S2cTVgzSkfjBUugrpX+xv8lu+iZg6H8AmXtvJNQYj4 /iSgSSqn/wo4Y3+CnVeD3tWAF9B5pUYQOGqgiU4ZjqS+jghAOdtsOWKmZlT0Vo0dKQmK bh9Ixkaw3O82AiK7dm+gqU498kFd3PrtXrVfHDJ70BzqBrbhl9g15fBm7Gpsc4mSpL3A Ank+2HDxpwhOLYjWkc9bfDFrmizhxRLStspm+m1Rw2kspiPfIL/HrgL7g4ZXMhUYVDx+ xQdoCIEhBXjlc3xmBjw3U9/UuHXP2AcfDB0Af7FReQQjKJsBwL4qPR+lx4vOq0DHQvUq MKgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775951484; x=1776556284; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3oJOXl83w5zIKf4SQrANUMBi1ywOW39XvkHlHjGUHtA=; b=o5dUEblCObcuPVyYisaYmx8xB3OnkTu7RqkGVcCh+hLdAJBo4rUI+0+giMaYdBFX0p V9xWpVp8zgGd9RHAMkB6Xln64LQq8ZwJdlXiw5duM16N3pk9QUeCMB2T3GpDV/+GcN95 8qHyREa7i8DTZWzVAf4HZkfGabxXlEcDj1VhLaLxnt16kISPE665dWEHAse5CaDTka5J 2dzSWGK2Pce4rIJSdzohJd4htwbRMdvyumOQNb+gn80YMIi6NDuCFEBL3T1w/WoblAH2 e9vhILwrb/w9KmOdJ5C/6hZIZIim8HOts5Qb6MLHxU629X6hlzqs9fJUTJT2Qr/w43kY inIw== X-Forwarded-Encrypted: i=1; AJvYcCXAhgvBqsHacsvzbi6A4O+jlh1yNZL9mCSgf+CsyvnXMew1mBGlABimcppn20cCPsMUk/v12LepxHo=@lists.freedesktop.org X-Gm-Message-State: AOJu0YxiVjXRGnRM26iOBQilwzUeLEspMe1PZU1lPj46sKpQwNkFqFOV OzhwrjN5Jl6qWr69Hj3XZTiemTcOke/fClut0A9kduXhsstfJngACWv/Gkq5QNrwp3PMhPvFVA1 NCbfaMf96DtTgG27bULTuiKAq+WvvloU6kCiH1X6dt2vtKH0+fWbF4U9TmmC3qRH61ATrHvw= X-Gm-Gg: AeBDieswSwNlays2Wtejp2VxzpZiFjlnALVb09TrLfM9Ei9UM75kls6IDbWUQM6P4Ay iJEqW54RpgMB57VJnstW1Yx7hSfGwzL/6LpPgSVCVqmvM8s16hOSZKX1t9/+qevqRZHG4hR8Trn tL8+Av4XVcxtBPU+Q9/4LE4x8LUZ+1BUhxmQX5EPfFSuyMJrkddN6RVZ7HFRIkt57U73zjFDJfN j+DNrTMsZHlhZ5zvF1yKtGWJyZJ/BBXKaRn0iagglPjwZJMK9wvKLknWwX3+bWGMtB9giabXuuL iF9De+6aZAp1PRn+Fi47njRR5YmedJGJL/Oh+RhHqz2Dib26m7Ex3do7PgxnCrOaDet9ObcUW5K uKZxY61P9ZIm2V8acGainE+cvmUL/TobEu3gcFPbYAkaRZTDbupafpIOlI586diTkwRkyv8DZRE tuM+tdKQTksArLKLTHpBC6+tp7Fij4KBJarnM= X-Received: by 2002:a05:622a:6bc5:b0:50d:8c24:20f2 with SMTP id d75a77b69052e-50dd5baafddmr89992621cf.30.1775951483899; Sat, 11 Apr 2026 16:51:23 -0700 (PDT) X-Received: by 2002:a05:622a:6bc5:b0:50d:8c24:20f2 with SMTP id d75a77b69052e-50dd5baafddmr89992401cf.30.1775951483366; Sat, 11 Apr 2026 16:51:23 -0700 (PDT) Received: from umbar.lan (2001-14ba-a073-af00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a073:af00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5a3eef08c10sm1663298e87.83.2026.04.11.16.51.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Apr 2026 16:51:22 -0700 (PDT) Date: Sun, 12 Apr 2026 02:51:19 +0300 From: Dmitry Baryshkov To: Yongxing Mou Cc: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Jessica Zhang , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Abhinav Kumar Subject: Re: [PATCH v4 34/39] drm/msm/dp: add dp_mst_drm to manage DP MST bridge operations Message-ID: References: <20260410-msm-dp-mst-v4-0-b20518dea8de@oss.qualcomm.com> <20260410-msm-dp-mst-v4-34-b20518dea8de@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260410-msm-dp-mst-v4-34-b20518dea8de@oss.qualcomm.com> X-Proofpoint-GUID: VfzzlgrAq3kFNri9jMj6eBnJCo478zQG X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDExMDIxNiBTYWx0ZWRfX6uvezKYaVVQA 7DhQNqKFjwnHTTtQMe5PaFOthPIYu1ka8YjZdVAa6v3gSIplMRw1QjfWhgGY16fuajkQQ6+ieop FOk/kM5uag7PjZzHkN3rckBAVJbM0COjSmbgyd1C6knepqBWfUOCrkCcyg2fHlVdH2UoPFGFPUH DViX+h4fqi3TeJkij2ZYuEPGgsXmbvK2Wn/QGZTFcrLEw5iPVvjOkB0sli+RTHXnpumUzsRuQWY 0+O0cme4vd2bIsjcbSCYaeiH7fBcZlP0RJ0RxDK/TC80Ok/R5z2jXWf1swgipxjPRAy9x7czV5e DwBum3Ix87cid/30BKpg8WFKL4pPV9k5UuySEN55vRTF7QjKNwoRH+I/oJYZAFWk1YCRjSyFBcF C0+Tv8WrnPhO9GHj+pWTPvryxDlgvRSoX+IUdtrmiRsyLeEPor5siz5orucVb5napxwKlX+ZGJD CUwWFCcPQCLPfDjC3/w== X-Authority-Analysis: v=2.4 cv=FPQrAeos c=1 sm=1 tr=0 ts=69dade7d cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A: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=c_jRCA7w00fGOAweXKEA:9 a=CjuIK1q_8ugA:10 a=kacYvNCVWA4VmyqE58fU:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-ORIG-GUID: VfzzlgrAq3kFNri9jMj6eBnJCo478zQG 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-11_07,2026-04-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 suspectscore=0 impostorscore=0 malwarescore=0 adultscore=0 clxscore=1015 spamscore=0 priorityscore=1501 bulkscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604010000 definitions=main-2604110216 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Fri, Apr 10, 2026 at 05:34:09PM +0800, Yongxing Mou wrote: > From: Abhinav Kumar > > Add dp_mst_drm to manage the DP MST bridge operations similar to the > dp_drm file which manages the SST bridge operations. Each MST encoder > creates one bridge and each bridge is bound to its own dp_panel > abstraction to manage the operations of its pipeline. This doesn't explain the most important part: why do we need a bridge? There is nothing else between the encoder and the connector. The bridge state is almost empty. Can we squash it into the MST connector? > > Keep the connector/panel association in bridge private state for atomic > assignment and release, and mirror it in the bridge object for runtime > bridge callbacks. > > Signed-off-by: Abhinav Kumar > Signed-off-by: Yongxing Mou > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 6 + > drivers/gpu/drm/msm/dp/dp_mst_drm.c | 459 +++++++++++++++++++++++++++++++- > drivers/gpu/drm/msm/msm_drv.h | 7 + > 3 files changed, 471 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > index d7ce13a4586d..89868443c0fe 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > @@ -692,6 +692,12 @@ static int _dpu_kms_initialize_displayport(struct drm_device *dev, > DPU_ERROR("encoder init failed for dp mst display\n"); > return PTR_ERR(encoder); > } > + > + rc = msm_dp_mst_attach_encoder(priv->kms->dp[i], encoder); > + if (rc) { > + DPU_ERROR("DP MST init failed, %d\n", rc); > + continue; > + } > } > } > } > diff --git a/drivers/gpu/drm/msm/dp/dp_mst_drm.c b/drivers/gpu/drm/msm/dp/dp_mst_drm.c > index b6c7b8211025..4df3ea5e36d0 100644 > --- a/drivers/gpu/drm/msm/dp/dp_mst_drm.c > +++ b/drivers/gpu/drm/msm/dp/dp_mst_drm.c > @@ -13,8 +13,47 @@ > > #define MAX_DPCD_TRANSACTION_BYTES 16 > > +#define to_dp_mst_bridge(x) container_of((x), struct msm_dp_mst_bridge, base) > +#define to_dp_mst_bridge_state_priv(x) \ > + container_of((x), struct msm_dp_mst_bridge_state, base) > +#define to_dp_mst_bridge_state(x) \ > + to_dp_mst_bridge_state_priv((x)->obj.state) > +#define to_dp_mst_connector(x) \ > + container_of((x), struct msm_dp_mst_connector, connector) > + > +#define DP_MST_CONN_ID(x) ((x)->connector ? \ > + (x)->connector->base.id : 0) > + > +struct msm_dp_mst_bridge { > + struct drm_bridge base; > + struct drm_private_obj obj; > + u32 id; > + > + bool initialized; > + > + struct msm_dp *display; > + struct drm_encoder *encoder; > + > + struct drm_connector *connector; > + struct msm_dp_panel *msm_dp_panel; > +}; > + > +struct msm_dp_mst_bridge_state { > + struct drm_private_state base; > + struct drm_connector *connector; > + struct msm_dp_panel *msm_dp_panel; > +}; > + > +struct msm_dp_mst_connector { > + struct drm_connector connector; > + struct drm_dp_mst_port *mst_port; > + struct msm_dp_mst *dp_mst; > + struct msm_dp_panel *dp_panel; After squashing the bridge to the connector, you might need to separate state from the non-state variables. > +}; > + > struct msm_dp_mst { > struct drm_dp_mst_topology_mgr mst_mgr; > + struct msm_dp_mst_bridge *mst_bridge[DP_STREAM_MAX]; > struct msm_dp *msm_dp; > struct drm_dp_aux *dp_aux; > u32 max_streams; > @@ -22,6 +61,419 @@ struct msm_dp_mst { > struct mutex mst_lock; > }; > > +static struct drm_private_state *msm_dp_mst_duplicate_bridge_state(struct drm_private_obj *obj) > +{ > + struct msm_dp_mst_bridge_state *mst_bridge_state; > + > + mst_bridge_state = kmemdup(obj->state, sizeof(*mst_bridge_state), GFP_KERNEL); > + if (!mst_bridge_state) > + return NULL; > + > + __drm_atomic_helper_private_obj_duplicate_state(obj, &mst_bridge_state->base); > + > + return &mst_bridge_state->base; > +} > + > +static void msm_dp_mst_destroy_bridge_state(struct drm_private_obj *obj, > + struct drm_private_state *state) > +{ > + struct msm_dp_mst_bridge_state *mst_bridge_state = > + to_dp_mst_bridge_state_priv(state); > + > + kfree(mst_bridge_state); > +} > + > +static const struct drm_private_state_funcs msm_dp_mst_bridge_state_funcs = { > + .atomic_duplicate_state = msm_dp_mst_duplicate_bridge_state, > + .atomic_destroy_state = msm_dp_mst_destroy_bridge_state, > +}; > + > +static struct msm_dp_mst_bridge_state *msm_dp_mst_br_priv_state(struct drm_atomic_state *st, > + struct msm_dp_mst_bridge *bridge) > +{ > + struct drm_device *dev = bridge->base.dev; > + struct drm_private_state *obj_state = drm_atomic_get_private_obj_state(st, &bridge->obj); > + > + WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex)); > + > + return to_dp_mst_bridge_state_priv(obj_state); > +} > + > +static void msm_dp_mst_update_timeslots(struct msm_dp_mst *mst, > + struct msm_dp_mst_bridge *mst_bridge, > + struct drm_atomic_state *state, > + struct drm_dp_mst_port *port) > +{ > + struct drm_dp_mst_topology_state *mst_state; > + struct drm_dp_mst_atomic_payload *payload; > + > + mst_state = to_drm_dp_mst_topology_state(mst->mst_mgr.base.state); > + payload = drm_atomic_get_mst_payload_state(mst_state, port); > + > + if (!payload) { > + DRM_ERROR("MST bridge [%d] update_timeslots failed, null payload\n", > + mst_bridge->id); > + return; > + } > + > + if (payload->vc_start_slot < 0) > + msm_dp_display_set_stream_info(mst->msm_dp, mst_bridge->msm_dp_panel, > + mst_bridge->id, 1, 0, 0); > + else > + msm_dp_display_set_stream_info(mst->msm_dp, mst_bridge->msm_dp_panel, > + mst_bridge->id, payload->vc_start_slot, > + payload->time_slots, payload->pbn); > +} > + > +static int msm_dp_mst_bridge_pre_enable_part1(struct msm_dp_mst_bridge *dp_bridge, > + struct drm_atomic_state *state) > +{ > + struct msm_dp *dp_display = dp_bridge->display; > + struct msm_dp_mst *mst = dp_display->msm_dp_mst; > + struct msm_dp_mst_connector *mst_conn = to_dp_mst_connector(dp_bridge->connector); > + struct drm_dp_mst_port *port = mst_conn->mst_port; > + struct drm_dp_mst_topology_state *mst_state; > + struct drm_dp_mst_atomic_payload *payload; > + struct msm_dp_panel *dp_panel = mst_conn->dp_panel; > + int pbn; > + int rc = 0; > + > + mst_state = drm_atomic_get_new_mst_topology_state(state, &mst->mst_mgr); > + > + pbn = drm_dp_calc_pbn_mode(dp_panel->msm_dp_mode.drm_mode.clock, > + (mst_conn->connector.display_info.bpc * 3) << 4); > + > + payload = drm_atomic_get_mst_payload_state(mst_state, port); > + if (!payload || payload->time_slots <= 0) { > + DRM_ERROR("time slots not allocated for conn:%d\n", DP_MST_CONN_ID(dp_bridge)); > + rc = -EINVAL; > + return rc; > + } > + > + drm_dbg_dp(dp_display->drm_dev, "conn:%d pbn:%d, slots:%d\n", DP_MST_CONN_ID(dp_bridge), > + pbn, payload->time_slots); > + > + drm_dp_mst_update_slots(mst_state, DP_CAP_ANSI_8B10B); > + > + rc = drm_dp_add_payload_part1(&mst->mst_mgr, mst_state, payload); > + if (rc) { > + DRM_ERROR("payload allocation failure for conn:%d\n", DP_MST_CONN_ID(dp_bridge)); > + return rc; > + } > + > + msm_dp_mst_update_timeslots(mst, dp_bridge, state, port); > + > + return rc; > +} > + > +static void _msm_dp_mst_bridge_pre_enable_part2(struct msm_dp_mst_bridge *dp_bridge, > + struct drm_atomic_state *state) > +{ > + struct msm_dp *dp_display = dp_bridge->display; > + struct msm_dp_mst *mst = dp_display->msm_dp_mst; > + struct msm_dp_mst_connector *mst_conn = to_dp_mst_connector(dp_bridge->connector); > + struct drm_dp_mst_port *port = mst_conn->mst_port; > + struct drm_dp_mst_topology_state *mst_state; > + struct drm_dp_mst_atomic_payload *payload; > + > + drm_dp_check_act_status(&mst->mst_mgr); > + > + mst_state = to_drm_dp_mst_topology_state(mst->mst_mgr.base.state); > + payload = drm_atomic_get_mst_payload_state(mst_state, port); > + > + drm_dp_add_payload_part2(&mst->mst_mgr, payload); > + > + drm_dbg_dp(dp_display->drm_dev, "MST bridge [%d] _pre enable part-2 complete\n", > + dp_bridge->id); > +} > + > +static void msm_dp_mst_bridge_pre_disable_part1(struct msm_dp_mst_bridge *dp_bridge, > + struct drm_atomic_state *state) > +{ > + struct msm_dp *dp_display = dp_bridge->display; > + struct msm_dp_mst *mst = dp_display->msm_dp_mst; > + struct msm_dp_mst_connector *mst_conn = to_dp_mst_connector(dp_bridge->connector); > + struct drm_dp_mst_port *port = mst_conn->mst_port; > + struct drm_dp_mst_topology_state *old_mst_state; > + struct drm_dp_mst_topology_state *new_mst_state; > + const struct drm_dp_mst_atomic_payload *old_payload; > + struct drm_dp_mst_atomic_payload *new_payload; > + > + old_mst_state = drm_atomic_get_old_mst_topology_state(state, &mst->mst_mgr); > + new_mst_state = drm_atomic_get_new_mst_topology_state(state, &mst->mst_mgr); > + > + old_payload = drm_atomic_get_mst_payload_state(old_mst_state, port); > + new_payload = drm_atomic_get_mst_payload_state(new_mst_state, port); > + > + if (!old_payload || !new_payload) { > + DRM_ERROR("MST bridge [%d] _pre disable part-1 failed, null payload\n", > + dp_bridge->id); > + return; > + } > + > + drm_dp_remove_payload_part1(&mst->mst_mgr, new_mst_state, new_payload); > + drm_dp_remove_payload_part2(&mst->mst_mgr, new_mst_state, old_payload, new_payload); > + > + msm_dp_mst_update_timeslots(mst, dp_bridge, state, port); > + > + drm_dbg_dp(dp_display->drm_dev, "MST bridge [%d] _pre disable part-1 complete\n", > + dp_bridge->id); > +} > + > +static void msm_dp_mst_bridge_atomic_pre_enable(struct drm_bridge *drm_bridge, > + struct drm_atomic_state *state) > +{ > + int rc = 0; > + struct msm_dp_mst_bridge *bridge; > + struct msm_dp *dp_display; > + struct msm_dp_mst_bridge_state *mst_bridge_state; > + struct msm_dp_mst *dp_mst; > + struct msm_dp_panel *msm_dp_panel; > + > + if (!drm_bridge) { > + DRM_ERROR("Invalid params\n"); > + return; > + } > + > + bridge = to_dp_mst_bridge(drm_bridge); > + mst_bridge_state = to_dp_mst_bridge_state(bridge); > + dp_display = bridge->display; > + dp_mst = dp_display->msm_dp_mst; > + > + /* to cover cases of bridge_disable/bridge_enable without modeset */ > + bridge->connector = mst_bridge_state->connector; > + bridge->msm_dp_panel = mst_bridge_state->msm_dp_panel; > + > + if (!bridge->connector) { > + DRM_ERROR("Invalid connector\n"); > + return; > + } > + > + msm_dp_panel = bridge->msm_dp_panel; > + mutex_lock(&dp_mst->mst_lock); > + > + rc = msm_dp_display_set_mode_helper(dp_display, state, drm_bridge->encoder, msm_dp_panel); > + if (rc) { > + DRM_ERROR("Failed to perform a mode set, rc=%d\n", rc); > + mutex_unlock(&dp_mst->mst_lock); > + return; > + } > + msm_dp_panel->pbn = drm_dp_calc_pbn_mode(msm_dp_panel->msm_dp_mode.drm_mode.clock, > + msm_dp_panel->msm_dp_mode.bpp << 4); > + rc = msm_dp_display_prepare(dp_display); > + if (rc) { > + DRM_ERROR("[%d] DP display pre-enable failed, rc=%d\n", bridge->id, rc); > + msm_dp_display_unprepare(dp_display); > + mutex_unlock(&dp_mst->mst_lock); > + return; > + } > + > + rc = msm_dp_mst_bridge_pre_enable_part1(bridge, state); > + if (rc) { > + DRM_ERROR("[%d] DP display pre-enable failed, rc=%d\n", bridge->id, rc); > + mutex_unlock(&dp_mst->mst_lock); > + return; > + } > + > + msm_dp_display_enable_helper(dp_display, bridge->msm_dp_panel); > + > + _msm_dp_mst_bridge_pre_enable_part2(bridge, state); > + > + mutex_unlock(&dp_mst->mst_lock); > + > + drm_dbg_dp(dp_display->drm_dev, "conn:%d mode:%s pre enable done\n", > + DP_MST_CONN_ID(bridge), bridge->msm_dp_panel->msm_dp_mode.drm_mode.name); > +} > + > +static void msm_dp_mst_bridge_atomic_disable(struct drm_bridge *drm_bridge, > + struct drm_atomic_state *state) > +{ > + struct msm_dp_mst_bridge *bridge; > + struct msm_dp *dp_display; > + struct msm_dp_mst *mst; > + > + if (!drm_bridge) { > + DRM_ERROR("Invalid params\n"); > + return; > + } > + > + bridge = to_dp_mst_bridge(drm_bridge); > + if (!bridge->connector) { > + DRM_ERROR("Invalid connector\n"); > + return; > + } > + > + dp_display = bridge->display; > + mst = dp_display->msm_dp_mst; > + > + mutex_lock(&mst->mst_lock); > + > + msm_dp_mst_bridge_pre_disable_part1(bridge, state); > + > + msm_dp_display_disable_helper(dp_display, bridge->msm_dp_panel); > + > + drm_dp_check_act_status(&mst->mst_mgr); > + > + mutex_unlock(&mst->mst_lock); > + > + drm_dbg_dp(dp_display->drm_dev, "MST bridge:%d disable complete\n", bridge->id); > +} > + > +static void msm_dp_mst_bridge_atomic_post_disable(struct drm_bridge *drm_bridge, > + struct drm_atomic_state *state) > +{ > + struct msm_dp_mst_bridge *bridge; > + struct msm_dp *dp_display; > + struct msm_dp_mst *mst; > + > + if (!drm_bridge) { > + DRM_ERROR("Invalid params\n"); > + return; > + } > + > + bridge = to_dp_mst_bridge(drm_bridge); > + if (!bridge->connector) { > + DRM_ERROR("Invalid connector\n"); > + return; > + } > + > + dp_display = bridge->display; > + mst = dp_display->msm_dp_mst; > + > + mutex_lock(&mst->mst_lock); > + > + msm_dp_display_atomic_post_disable_helper(dp_display, bridge->msm_dp_panel); > + > + if (!dp_display->mst_active) > + msm_dp_display_unprepare(dp_display); > + > + bridge->connector = NULL; > + bridge->msm_dp_panel = NULL; > + > + mutex_unlock(&mst->mst_lock); > + > + drm_dbg_dp(dp_display->drm_dev, "MST bridge:%d conn:%d post disable complete\n", > + bridge->id, DP_MST_CONN_ID(bridge)); > +} > + > +static int msm_dp_mst_bridge_atomic_check(struct drm_bridge *drm_bridge, > + struct drm_bridge_state *bridge_state, > + struct drm_crtc_state *crtc_state, > + struct drm_connector_state *conn_state) > +{ > + struct drm_atomic_state *state = crtc_state->state; > + struct drm_connector *connector = conn_state->connector; > + struct drm_dp_mst_topology_state *mst_state; > + struct msm_dp_mst_connector *mst_conn; > + struct msm_dp_mst *mst; > + int rc = 0, pbn, slots; > + struct msm_dp_mst_bridge_state *mst_bridge_state; > + u32 bpp; > + > + if (!drm_atomic_crtc_needs_modeset(crtc_state) || !crtc_state->enable) > + return 0; > + > + mst_conn = to_dp_mst_connector(connector); > + mst = mst_conn->dp_mst; > + > + bpp = connector->display_info.bpc * 3; > + > + if (!bpp) > + bpp = 24; > + > + pbn = drm_dp_calc_pbn_mode(crtc_state->mode.clock, bpp << 4); > + > + mst_state = to_drm_dp_mst_topology_state(mst->mst_mgr.base.state); > + if (IS_ERR(mst_state)) > + return PTR_ERR(mst_state); > + > + if (!dfixed_trunc(mst_state->pbn_div)) { > + mst_state->pbn_div = > + drm_dp_get_vc_payload_bw(mst_conn->dp_panel->link_info.rate, > + mst_conn->dp_panel->link_info.num_lanes); > + } > + > + slots = drm_dp_atomic_find_time_slots(state, &mst->mst_mgr, mst_conn->mst_port, pbn); > + > + drm_dbg_dp(drm_bridge->dev, "add slots, conn:%d pbn:%d slots:%d rc:%d\n", > + connector->base.id, pbn, slots, rc); > + > + if (!conn_state->crtc) { > + mst_bridge_state = msm_dp_mst_br_priv_state(state, to_dp_mst_bridge(drm_bridge)); > + mst_bridge_state->connector = NULL; > + mst_bridge_state->msm_dp_panel = NULL; > + } > + > + return 0; > +} > + > +/* DP MST Bridge APIs */ > +static const struct drm_bridge_funcs msm_dp_mst_bridge_ops = { > + .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, > + .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, > + .atomic_reset = drm_atomic_helper_bridge_reset, > + .atomic_pre_enable = msm_dp_mst_bridge_atomic_pre_enable, > + .atomic_disable = msm_dp_mst_bridge_atomic_disable, > + .atomic_post_disable = msm_dp_mst_bridge_atomic_post_disable, > + .atomic_check = msm_dp_mst_bridge_atomic_check, > +}; > + > +int msm_dp_mst_attach_encoder(struct msm_dp *dp_display, struct drm_encoder *encoder) > +{ > + int rc = 0; > + struct msm_dp_mst_bridge *bridge = NULL; > + struct msm_dp_mst_bridge_state *mst_bridge_state; > + struct drm_device *dev; > + struct msm_dp_mst *mst = dp_display->msm_dp_mst; > + int i; > + > + for (i = 0; i < mst->max_streams; i++) { > + if (!mst->mst_bridge[i]->initialized) { We _know_ that it is not initialized now. And anyway, it's an error if we call this twice. > + bridge = mst->mst_bridge[i]; > + bridge->encoder = encoder; This looks wrong. It's already stored inside drm_bridge > + bridge->initialized = true; > + bridge->id = i; Definitely not an id. > + break; > + } > + } > + > + if (i == mst->max_streams) { > + DRM_ERROR("MST supports only %d bridges\n", mst->max_streams); > + rc = -EACCES; > + goto end; > + } > + > + dev = dp_display->drm_dev; > + bridge->display = dp_display; > + bridge->base.encoder = encoder; why? > + bridge->base.type = dp_display->connector_type; > + bridge->base.ops = DRM_BRIDGE_OP_MODES; > + drm_bridge_add(&bridge->base); > + > + rc = drm_bridge_attach(encoder, &bridge->base, NULL, 0); > + if (rc) { > + DRM_ERROR("failed to attach bridge, rc=%d\n", rc); > + goto end; > + } > + > + mst_bridge_state = kzalloc(sizeof(*mst_bridge_state), GFP_KERNEL); > + if (!mst_bridge_state) { > + rc = -ENOMEM; > + goto end; > + } > + > + drm_atomic_private_obj_init(dev, &bridge->obj, > + &mst_bridge_state->base, > + &msm_dp_mst_bridge_state_funcs); It's already done for you in the drm_bridge_attach(). > + > + drm_dbg_dp(dp_display->drm_dev, "MST drm bridge init. bridge id:%d\n", i); > + > + return 0; > + > +end: > + return rc; > +} > + > int msm_dp_mst_display_set_mgr_state(struct msm_dp *dp_display, bool state) > { > struct msm_dp_mst *mst = dp_display->msm_dp_mst; > @@ -49,11 +501,16 @@ int msm_dp_mst_init(struct msm_dp *dp_display, u32 max_streams, struct drm_dp_au > return -ENOMEM; > > memset(&msm_dp_mst->mst_mgr, 0, sizeof(msm_dp_mst->mst_mgr)); > - > conn_base_id = dp_display->connector->base.id; > msm_dp_mst->msm_dp = dp_display; > msm_dp_mst->max_streams = max_streams; > > + for (int i = 0; i < DP_STREAM_MAX; i++) { > + msm_dp_mst->mst_bridge[i] = > + devm_drm_bridge_alloc(dev->dev, struct msm_dp_mst_bridge, base, > + &msm_dp_mst_bridge_ops); > + } > + > msm_dp_mst->dp_aux = drm_aux; > > ret = drm_dp_mst_topology_mgr_init(&msm_dp_mst->mst_mgr, dev, > diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h > index 5f73e0aa1c2f..03bedd15fe02 100644 > --- a/drivers/gpu/drm/msm/msm_drv.h > +++ b/drivers/gpu/drm/msm/msm_drv.h > @@ -364,6 +364,8 @@ bool msm_dp_needs_periph_flush(const struct msm_dp *dp_display, > bool msm_dp_wide_bus_available(const struct msm_dp *dp_display); > int msm_dp_get_mst_max_stream(struct msm_dp *dp_display); > int msm_dp_mst_register(struct msm_dp *dp_display); > +int msm_dp_mst_attach_encoder(struct msm_dp *dp_display, struct drm_encoder *encoder); > + > #else > static inline int __init msm_dp_register(void) > { > @@ -390,6 +392,11 @@ static inline int msm_dp_mst_register(struct msm_dp *dp_display) > return -EINVAL; > } > > +static inline int msm_dp_mst_attach_encoder(struct msm_dp *dp_display, struct drm_encoder *encoder) > +{ > + return -EINVAL; > +} > + > static inline void msm_dp_snapshot(struct msm_disp_state *disp_state, struct msm_dp *dp_display) > { > } > > -- > 2.43.0 > -- With best wishes Dmitry