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 E8F283FBB59 for ; Mon, 18 May 2026 12:00: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=1779105647; cv=none; b=ZHpZIE0HhGSqU/V8ZS0lFv1D+cEdIzGNF2cyppVJAcwQtikQWUepmSXnE5bJVyXHsy68lgOPemFnlKgbFfmMh+uX1KS5WjtUbAuon7KL20DGTy2RG973j63Cb4X/MnciUPziMG2z21A3xRtrh+woXj/Z0J/E6DdQRgEXQUuogRw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779105647; c=relaxed/simple; bh=G6RvxVqIwc6P2yYBUqqqL9zZMWXDBkNpt1J1HYEvzyg=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=JrWuohFyOJzCGuJSyGc/P1e/9qdZ49sKsRPzBcGJqYOv8i3bZ/SYrp4hbP3bQbUINX4jasRgHiKHJykBSqza8jDJEEU8DsARaPjf/23C67R4JWr99mvfmN3rfcUdyDPmSyZefpfmpCTrgd+0WmdMio91UbnAFkyzoCM+MWYApYk= 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=mObGUGwZ; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=QKpDBSLe; 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="mObGUGwZ"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="QKpDBSLe" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64IAZnYu2685236 for ; Mon, 18 May 2026 12:00: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= KrbQ/vyh+45K2Kl/bgUqTiJQ8BlkmuyJIN5X26xfd20=; b=mObGUGwZl8MBDZ// LcVAVeAscPpVNRyg7rJ69116tRtiOs8BsT/WyNIDHMtyEHvGkX/xqPWXQ+BjNWTr AnPWi0N3sZEGXftWJB1BiDmp3z7dP7qWwNXU4xBt9dR87uMxotxdHS6uvy/CeKAq wG/XJkVEuuD3+HfjJfsz5Dcddatf2jsoLdNRpEL2gWJTl7iImJ7StTq84ECSyIOL Wf24e6sPWahIXoHcpZCiCh07xo2yJ3eLaV45IDxRfoMQZAIGRrcEqXtrEUKB+2Hp j7BmJJbtN7xx7n5ixG8nuITm7iHGd2m7pe/O/eY5HNgRL4/aJGEUdPSoSoQBAJsQ n0VSPQ== Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e7vrbsmx2-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 18 May 2026 12:00:45 +0000 (GMT) Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-83cecc22d5fso1107773b3a.2 for ; Mon, 18 May 2026 05:00:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779105644; x=1779710444; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=KrbQ/vyh+45K2Kl/bgUqTiJQ8BlkmuyJIN5X26xfd20=; b=QKpDBSLe42Zt0W/dAoOk83hhLbmF9vdTyQXJMiRzMG8Pa8hc91bucKiEeaeV0xRNLu BH/ewdPaM/3XGB/7ku1oHqtRHVSYievp+hWY4m7peYbbm4+YZgNucD0k5K5ZHNm/ATnW ncrYicziyNUI9MdKLb0Eb+b3SoIa06RIj1S5z9gKXkmV0kZo8nSP4WfmkO2e/9G3PVvB ZTxrj3DPRNNSFcbAI6ie1wzKj3Uh1o4EjYB1W+YVt9ejzIQ6m2Sdd0G4D1/DO8vQ7UOc C+MYaVJO5Xj2JAVdsW3REZJ4II45Jv7de4e8jXD/k2uE5AnZoH52wbRau9VW2RjinSOB sx5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779105644; x=1779710444; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=KrbQ/vyh+45K2Kl/bgUqTiJQ8BlkmuyJIN5X26xfd20=; b=IhJaWvpscQPG49ejBZGVGcFNNIdBVLVJYEQ1N+Y2nJyEDNdH0HFwbhN6foJMjtqiIp lZGZhb1cgxYGzbvJGwylrc3s9nSUS5Rv8N7vOWXXWR2j2muEAvY195Q2tS5xCG1jEX4U KDVmG0aNCf3wlI+pmmpyaxWSAcNuir5gPG1zj232PaCkk1wnfbh+s1AYQA2ZRkhbEw3v t1+QNDSE454973ONmKoBcbH+IbRL6krfwWRP7TsQcnG2HEK3J4D5xMeohtsfBL3cc6pD 3HudXZ+8mo6IIvOFpU+ayHECrjuUyANC/UJWvSFmZ6KV1o9tHo3kx2zvD50Zprl+vW3L 4shw== X-Forwarded-Encrypted: i=1; AFNElJ/2skjGfHaOH2kHQqdysGAT0FjZgYKYXW7bPeQpevoKc0yGux8I7KPidxCHPq3Vzi6wINe8YdZrpPxDgKA=@vger.kernel.org X-Gm-Message-State: AOJu0Yw6UjW/NmTcxQEfQ7nihT6ZYt68wcZJitqaSAMZa4MEoOyjpFea IFYt1YURyIUIxma42VUzBsmHaycnSxePdgQIW+6NWgUe3TsvUgGq+gxBoW/u+cRxEh4bvdr9POl Jke2yZv5jBEHa3qX6UJ+hTDoYRRxDGSRpnKobpVZvo9/XruxLrOeFPViWr+Y2sut5388= X-Gm-Gg: Acq92OF+gqIAKzuzbT9FmGpcTMqh5R1msHgFGDl2b9i3ZqY1X/L9Sr/qdwo6JKM28NR BXNE5nSFMQ9UgBdXzbymqKcQufYNgh73VzunRNhGsCF+xJtjOEdTedI0SoeDqa79lHsfCgfQbos QIw9lGODguRq5a/gRAOw/d+Rd01UaihBiL5psr7Ty1PzEeGTeus2Dv3gwZg+dsV8ttHlYulgNoi 91J6sYer5xkKl20zzgowbvmAwdPHAWmU35E9iBZYupPXRrV0u3hzCINwzenbKAxTPV9+Vqpmw00 Zq/u1djWswGa/P2IeoSmniDJPbptWuvfy/fP3eap4Gn4vgZ/yhR4POjw7jZR9h7mA0A4YCrbGC+ bi0dt6zqB4KVIekCOkQUMzRJ0RLzNSHjUSzh5zuUE2xQL8kByHB70O3VXN/R50O5XGuYYFdrPSk fDuRJuKtDhUqOH/RR1TSSiKPlj0H4= X-Received: by 2002:a05:6a00:438f:b0:81e:ef16:b288 with SMTP id d2e1a72fcca58-83f33b65ba5mr14633579b3a.22.1779105642779; Mon, 18 May 2026 05:00:42 -0700 (PDT) X-Received: by 2002:a05:6a00:438f:b0:81e:ef16:b288 with SMTP id d2e1a72fcca58-83f33b65ba5mr14633363b3a.22.1779105640591; Mon, 18 May 2026 05:00:40 -0700 (PDT) Received: from [10.133.33.99] (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83f19778c87sm13579200b3a.19.2026.05.18.05.00.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 18 May 2026 05:00:39 -0700 (PDT) Message-ID: <7bab580b-376b-48bb-89bc-0969a3446b6c@oss.qualcomm.com> Date: Mon, 18 May 2026 20:00:33 +0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 34/39] drm/msm/dp: add dp_mst_drm to manage DP MST bridge operations To: Dmitry Baryshkov 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 References: <20260410-msm-dp-mst-v4-0-b20518dea8de@oss.qualcomm.com> <20260410-msm-dp-mst-v4-34-b20518dea8de@oss.qualcomm.com> Content-Language: en-US From: Yongxing Mou In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Proofpoint-GUID: UbzhglGBMxHzLTVya1IjP3sSxTbdwu6g X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTE4MDExNiBTYWx0ZWRfX5Tc39MfKUJmj mWXBw5NZ0CIzUJHLDVbNoiBr0B80AFb47Ln9Oc4si7qt5dzbxZZZUesxg2DJ4aPn5MwBiT1pQKx AOgcnNEvHpNp79SWsW5fhQLxbfcPo68wO8qF+ZdzJtO8FR//j6JMUvMjlwiVP9ajKtZXd6wqcKX nSeLJrczyIDOdo3cJE/yrs3zZ5+XaYyRxh9yE5Oh2Nqc1KVSLk2xgZhPGE8lGrD9PZ5/CHJlftu wOwg+mYDLTdZLWv99iDTcIYYfnzVALFLofDS07ddihXXeTj/xpSquSyoD8FCWNBPq9v7TdjYvlz nxepgMZhk7Ne5z1jI8OT+0P23VCPhlAIHK4jQ/TWkYqaCjAA1xWLfHfvWTxOIZQiQImpi+vBBCL NbAqiQfaDTPmy6XEtQKohrYEgLIQRcnKoIUxs5DiZrSOQBv7RH1+zlP+MGIWFjUx9VsQm+9Tptv PIisWG6i/HSMoJQnLaQ== X-Authority-Analysis: v=2.4 cv=KZ3idwYD c=1 sm=1 tr=0 ts=6a0aff6d cx=c_pps a=mDZGXZTwRPZaeRUbqKGCBw==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=U9p1Drm5swtDRwR2WhUA:9 a=QEXdDO2ut3YA:10 a=zc0IvFSfCIW2DFIPzwfm:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-ORIG-GUID: UbzhglGBMxHzLTVya1IjP3sSxTbdwu6g 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-05-18_03,2026-05-15_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 suspectscore=0 phishscore=0 priorityscore=1501 adultscore=0 clxscore=1015 spamscore=0 lowpriorityscore=0 bulkscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605180116 On 4/12/2026 7:51 AM, Dmitry Baryshkov wrote: > 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? > Emm ... I'll remove it in the next version and merge the logic directly into the MST connector. Here seems need lots of changes.. >> >> 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 >> >