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 164C63BFE2D for ; Mon, 29 Jun 2026 14:17:14 +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=1782742636; cv=none; b=IOTD3ncNH1374d496wVo9I/tVzexM7xaCPXPKpbsEZOa0eqSMFtTEYeXUI7e/Ln2sKEzCfvHKBvzpHs7LMK5rxNyMbyll6DD39uGF00DwvABpYf3gwzroY79HKJb3vV7afSCvym3wMwEPXumtmoynzYzyMdSTqUvKgfoHv/0Ifo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782742636; c=relaxed/simple; bh=2N25ZqVfMCVlIUNY7Z7f2RX2UUBnVPVDtT4yNvyHTt8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=L/w9FIxFTkLRvhi3jh+GZhJaFtHvZq+jW2l/T8fCRKHIug4QJ779xdFTv12AHiFrfkz9wq8dKaSTXjtYKYxKM+j/hN4FHkBeppjEJ8kXekc0ydRMClO2MmX/oEmn1l65sbbkBmqxkF4YbDDKrJ5nD9PIrAag3nf/gvPDNy8eWpE= 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=Ub3JQ1NA; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=BI7ZpCrP; 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="Ub3JQ1NA"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="BI7ZpCrP" 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 65TAT4IH2646947 for ; Mon, 29 Jun 2026 14:17:14 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= MLEmu0SuSJObPGT52LcwIf7D9jxRGU4XmXyxCd29wxY=; b=Ub3JQ1NAynwckSJ3 kCao9b7INLCOzZW3Ya8TBT4iwAO9ZobK9+mMU8hzgkYvejyGzNqi0WKMGRPAS9Fw u3CMbaxv/q+JpBHdREU6MLn35+PNAVG7OHiwpc/fbePuTc+YZzHiLC9iTy5QffGc KScBNlSsw9Y6eW/nHOx9S9+WsxTX7o4cy5/fXta2pGlqjLyhPgQY9vkyPBMHCA7T ILbvIA4/ljTwTJl27h9WqP+qlhylIznbEzm+wUrjt2gu6Nn7zj55fo87Pk/i8rs4 dxmLVwmcooU7boRV/y5okv7xMampBbTxvU5oZW+v9SblR+yYTLOl8JMfDcS74KZX z2DNqA== Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4f3m4tsnvn-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 29 Jun 2026 14:17:14 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-92e52306621so158696585a.1 for ; Mon, 29 Jun 2026 07:17:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782742633; x=1783347433; 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=MLEmu0SuSJObPGT52LcwIf7D9jxRGU4XmXyxCd29wxY=; b=BI7ZpCrPru9y38ihWYykp6dTmOmdawTAw7Zl1v+rWWhkvkH3J+nr5KahJ4fqy8mrqE Da2ghPdESI5PwAJKtiS59l3acuPV20Fcf65Tl0rGdCuVYOobBi9f1GYw30GSABxGpQvF SBMlO6fB1SnvETRjFulQjZmiHYchOy82oqrUVDQZ8pmIFMiJaoOuMlfFX1Uc8TQcmY4R fvYJ+tJvaF+kbznbLdjWRRabTh0zXoFHnhuCmQ/KdCYYmmeMN4HFMzwCOv7MZ2Jx2AWi 84091GJf3EG3jHVWM4qAii6Y3hUNBofCmL5ocOkNq9iUXbukOHTmavZK9rgtUof3ao2X j3Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782742633; x=1783347433; 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=MLEmu0SuSJObPGT52LcwIf7D9jxRGU4XmXyxCd29wxY=; b=XMhKWANmd8pxjvwQPXbnjYoPZ95Rct22UXH8T+lpJxXXylOyuCOs402pVtAkjMFMzk TMR8BaQ3ImVtDUBgMd2iUX6rltxooa3I5cgi6OMhrzMtkkfxgMWECuJPmSA1yRaDG+T3 ef8oGrRa+7WGRRRI59KQdGIHKvxQtkIQPXoczRda2brm6+teipzFzAeFjaLPhhx3ou7n dqzZovOACY+s1JJSFa4dmFQ8kMuh1C1EWR7HRVPWn++K6/C3HJFhaGS+9rhlp/7tIe2k BtTNUIh8fV6y/cMGpf3z8Qd2P0OtI5prpURXAUWg3oMHZj6gNVbvc7CK5KMcRlrXf4TR /+Cg== X-Forwarded-Encrypted: i=1; AFNElJ/yI5F/loGFIdkW7+Bh57u0s71KrFHz9Jl7M7xrDlTxOgTO3oukuAIHrfsW+zpxNB0lviM3tO/r8P4UpRg=@vger.kernel.org X-Gm-Message-State: AOJu0YzPsKE8Nszx4MUzBWrnusacQL40DrqUFXhwpdAv18rDn2oHM2G9 uwjZwKXvDbq2xcZyiOdF0VWsFaC9Jzi2plFHpDPQX+gyY3yNCmH1CVY61rT0bsqeI7k8sjMhGz4 tXEuevkxa5o7Ojw4nQ6TnVEd3Oiyf42CJz9kA2xniExd62HWyuocBdMyFbDD2SeptA2Y= X-Gm-Gg: AfdE7cnAPo9LYvMdWVDG1YaBpAdpHH1ewpVFjVpJKFaIHU/OcDykArVcSBeTMXVBzf2 FYtePyc3ijKiMtLwbI1KLkf0BdmaEzmVBSqc+0Z4/3OicsA1VPdT3HekOmTTMiS/u4c5KxotLVY R6re7GCEn62ntX8KPTIYZSoRC6HUSZ4nEzIgepjxi6o9G85ck6Kz3sfu2eP9CVX/8/DfJHGxQXq coI1lnKlkGwzr1n6uWaFJuX8ZQP99j79C8I7EEE1dtIY8G237e83KAdKvDHqAu3knTtgEaylDce 9470m3xSGYuGRN7tixGhu27zjJmYfb/1AqLlr5SiottVbG5qVmg+SgdHsfeHPuv9Y+6XLH+mjny ut7EhLibf1vtCr9AmTw9Hp/6ISMyC267OaTqtehDU+Sy4mtSVbLMk0Q7xmxWPuhRaPCWxlw== X-Received: by 2002:a05:620a:2916:b0:92b:7420:bd5c with SMTP id af79cd13be357-92e5f04de9amr155787785a.5.1782742632950; Mon, 29 Jun 2026 07:17:12 -0700 (PDT) X-Received: by 2002:a05:620a:2916:b0:92b:7420:bd5c with SMTP id af79cd13be357-92e5f04de9amr155781885a.5.1782742632307; Mon, 29 Jun 2026 07:17:12 -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.17.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 07:17:11 -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 Subject: [PATCH RESEND v5 24/25] drm/msm/dp: add connector abstraction for DP MST Date: Mon, 29 Jun 2026 22:14:45 +0800 Message-ID: <20260629-msm-dp-mst-v5-24-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=9169; i=yongxing.mou@oss.qualcomm.com; s=20250910; h=from:subject:message-id; bh=YsuaK/0OYI79/l+b6bHLlwEgQ38BKEFF+/BvXN79st4=; b=Ouy/psp6NXOyBjstHOL0Vfwli6PVuRiW+uDxMBE2Dn2Yspy3nf9+f6GCz+pyUBWswwVRe9ufp V65OSSsDsVsAth1TS6naZi3RE47vCGrUIGmUQYLNcW2Oh6YIbJroM85 X-Developer-Key: i=yongxing.mou@oss.qualcomm.com; a=ed25519; pk=rAy5J1eP+V7OXqH5FJ7ngMCtUrnHhut30ZTldOj52UM= Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjI5MDExOCBTYWx0ZWRfX4YSHnQtoCyIy 2wVEeCmEz3QcXUbIqa5q7svxnPDoD6GtUg8046V2B0Be8AyKLwrH4vmvhugBJFa1fb+iMa67ojw iKqRbQLHVVS/eIHZm/0z6uEp3gwBeNH/aGKduLyw4oNxQ4LSiIZAViOFP7NpfqHIHGjzdjr3Z/j GWUi4Zag8/sD4v6sR5ZZIrbYuYE1kLiR1fUkgUlqRkJ0QON2UeGtSrPcL0VkfUryza+VWHsck3G bK24nG/m6jkU0G2OXxhZvBCs98a8BpR/KwSCkcIXD4tooFgdNSPBcE8Jn1utNk4f3BuVTIgBWgN HstW7+6erIGpGqjoEiUzlfrDfYSudjVVux/SjOm+mw4y79eKOZBS7s+ihNrZQxrojGgR8tmwhZ0 CHpoY63nu5l9q2c1FgpTVTsCFeYAszI701TNTVpQuXSLKbuB+gxJaXocTHaVpsQQZoQ+bRFUZhb EaBYvLWSpiYTMnozPyQ== X-Authority-Analysis: v=2.4 cv=R58z39RX c=1 sm=1 tr=0 ts=6a427e6a cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=C3Dk8TwHQYyIj7nOf9RCJw==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=mVHCav_IkjWnAo0-rBcA:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNjI5MDExOCBTYWx0ZWRfXxA4NBseQmyeB tHR9lszkhkReR40AR2XjJqJ+5pLKTTdcn2Stzf2yrgBCP1m69j9JtzoHgSh3DBtDy7T7rRRAg7G Em2BEdZ2kLLFU4cd56xvE38tgJT+P9I= X-Proofpoint-ORIG-GUID: quZNoMCBHWucbGda79lDX8K69OAJAjNL X-Proofpoint-GUID: quZNoMCBHWucbGda79lDX8K69OAJAjNL 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 spamscore=0 suspectscore=0 phishscore=0 clxscore=1015 adultscore=0 malwarescore=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-2606150000 definitions=main-2606290118 From: Abhinav Kumar Introduce an MST connector abstraction for DP MST, with each MST connector associated with a DP panel and connected through a DRM bridge to an MST encoder. The connector is only used for MST helper callbacks, such as detect, get_modes, and get_encoder. Display enable/disable, hotplug handling, and modeset sequencing continue to be handled by the bridge path. Signed-off-by: Abhinav Kumar Signed-off-by: Yongxing Mou --- drivers/gpu/drm/msm/dp/dp_mst_drm.c | 232 ++++++++++++++++++++++++++++++++++++ 1 file changed, 232 insertions(+) diff --git a/drivers/gpu/drm/msm/dp/dp_mst_drm.c b/drivers/gpu/drm/msm/dp/dp_mst_drm.c index 6a77fdef85e9..12b47a413793 100644 --- a/drivers/gpu/drm/msm/dp/dp_mst_drm.c +++ b/drivers/gpu/drm/msm/dp/dp_mst_drm.c @@ -7,6 +7,7 @@ #include #include #include +#include #include "dp_mst_drm.h" #include "dp_panel.h" @@ -50,6 +51,18 @@ static struct msm_dp_panel *msm_dp_mst_panel_from_encoder(struct msm_dp_mst *mst return NULL; } +static int msm_dp_mst_encoder_stream_id(struct msm_dp_mst *mst, + struct drm_encoder *enc) +{ + int i; + + for (i = 0; i < mst->max_streams; i++) { + if (mst->mst_encoders[i].enc == enc) + return mst->mst_encoders[i].stream_id; + } + return -1; +} + static void msm_dp_mst_update_timeslots(struct msm_dp_mst *mst, struct msm_dp_panel *panel, struct drm_dp_mst_atomic_payload *payload) @@ -275,6 +288,224 @@ int msm_dp_mst_display_set_mgr_state(struct msm_dp *dp_display, bool state) return rc; } +/* DP MST Connector OPs */ +static int +msm_dp_mst_connector_detect(struct drm_connector *connector, + struct drm_modeset_acquire_ctx *ctx, + bool force) +{ + struct msm_dp_mst_connector *mst_conn = to_dp_mst_connector(connector); + struct msm_dp_mst *mst = mst_conn->dp_mst; + struct msm_dp *dp_display = mst->msm_dp; + struct device *dev = dp_display->drm_dev->dev; + enum drm_connector_status status = connector_status_disconnected; + int ret; + + ret = pm_runtime_resume_and_get(dev); + if (ret < 0) + return status; + + if (dp_display->mst_active) + status = drm_dp_mst_detect_port(connector, + ctx, &mst->mst_mgr, mst_conn->mst_port); + + pm_runtime_put_autosuspend(dev); + + return status; +} + +static int msm_dp_mst_connector_get_modes(struct drm_connector *connector) +{ + struct msm_dp_mst_connector *mst_conn = to_dp_mst_connector(connector); + struct msm_dp_mst *mst = mst_conn->dp_mst; + const struct drm_edid *drm_edid; + int rc; + + drm_edid = drm_dp_mst_edid_read(connector, &mst->mst_mgr, mst_conn->mst_port); + drm_edid_connector_update(connector, drm_edid); + + rc = drm_edid_connector_add_modes(connector); + + drm_edid_free(drm_edid); + + return rc; +} + +static enum drm_mode_status msm_dp_mst_connector_mode_valid(struct drm_connector *connector, + const struct drm_display_mode *mode) +{ + struct msm_dp_mst_connector *mst_conn; + struct drm_dp_mst_port *mst_port; + struct msm_dp *dp_display; + int required_pbn; + + if (drm_connector_is_unregistered(connector)) + return 0; + + mst_conn = to_dp_mst_connector(connector); + mst_port = mst_conn->mst_port; + dp_display = mst_conn->dp_mst->msm_dp; + + /* FIXME: use negotiated bpp (DSC, YUV 4:2:0, etc.); for now use + * 18bpp (6bpc) as a conservative lower bound like i915/nouveau. + */ + required_pbn = drm_dp_calc_pbn_mode(mode->clock, (6 * 3) << 4); + + if (required_pbn > mst_port->full_pbn) { + drm_dbg_dp(dp_display->drm_dev, "mode:%s not supported.\n", mode->name); + return MODE_CLOCK_HIGH; + } + + return msm_dp_display_mode_valid(dp_display, &connector->display_info, mode); +} + +static const struct drm_connector_funcs msm_dp_drm_mst_connector_funcs; + +static struct drm_encoder * +msm_dp_mst_atomic_best_encoder(struct drm_connector *connector, struct drm_atomic_commit *state) +{ + struct msm_dp_mst_connector *mst_conn = to_dp_mst_connector(connector); + struct msm_dp_mst *mst = mst_conn->dp_mst; + struct drm_connector_state *conn_state; + struct drm_connector *iter; + struct drm_connector_list_iter conn_iter; + u32 stream_mask = 0; + u32 i; + + conn_state = drm_atomic_get_new_connector_state(state, connector); + if (!conn_state) + return NULL; + + if (conn_state->best_encoder) + return conn_state->best_encoder; + + drm_connector_list_iter_begin(connector->dev, &conn_iter); + drm_for_each_connector_iter(iter, &conn_iter) { + struct drm_connector_state *peer_state; + int stream_id; + + if (iter == connector || + iter->funcs != &msm_dp_drm_mst_connector_funcs || + to_dp_mst_connector(iter)->dp_mst != mst) + continue; + + peer_state = drm_atomic_get_new_connector_state(state, iter) ?: iter->state; + if (!peer_state || !peer_state->crtc || !peer_state->best_encoder) + continue; + + stream_id = msm_dp_mst_encoder_stream_id(mst, peer_state->best_encoder); + if (stream_id >= 0 && stream_id < mst->max_streams) + stream_mask |= BIT(stream_id); + } + drm_connector_list_iter_end(&conn_iter); + + for (i = 0; i < mst->max_streams; i++) { + if (!(stream_mask & BIT(i))) { + conn_state->best_encoder = mst->mst_encoders[i].enc; + return mst->mst_encoders[i].enc; + } + } + + return NULL; +} + +static int msm_dp_mst_connector_atomic_check(struct drm_connector *connector, + struct drm_atomic_commit *state) +{ + struct msm_dp_mst_connector *mst_conn = to_dp_mst_connector(connector); + struct msm_dp_mst *mst = mst_conn->dp_mst; + + return drm_dp_atomic_release_time_slots(state, &mst->mst_mgr, mst_conn->mst_port); +} + +static void dp_mst_connector_destroy(struct drm_connector *connector) +{ + struct msm_dp_mst_connector *mst_conn = to_dp_mst_connector(connector); + + drm_connector_cleanup(connector); + drm_dp_mst_put_port_malloc(mst_conn->mst_port); + kfree(mst_conn); +} + +/* DRM MST callbacks */ +static const struct drm_connector_helper_funcs msm_dp_drm_mst_connector_helper_funcs = { + .get_modes = msm_dp_mst_connector_get_modes, + .detect_ctx = msm_dp_mst_connector_detect, + .mode_valid = msm_dp_mst_connector_mode_valid, + .atomic_best_encoder = msm_dp_mst_atomic_best_encoder, + .atomic_check = msm_dp_mst_connector_atomic_check, +}; + +static const struct drm_connector_funcs msm_dp_drm_mst_connector_funcs = { + .reset = drm_atomic_helper_connector_reset, + .destroy = dp_mst_connector_destroy, + .fill_modes = drm_helper_probe_single_connector_modes, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, +}; + +static struct drm_connector * +msm_dp_mst_add_connector(struct drm_dp_mst_topology_mgr *mgr, + struct drm_dp_mst_port *port, const char *pathprop) +{ + struct msm_dp_mst *mst = container_of(mgr, struct msm_dp_mst, mst_mgr); + struct drm_device *dev = mst->msm_dp->drm_dev; + struct msm_dp_mst_connector *mst_conn; + struct drm_connector *connector; + int rc, i; + + mst_conn = kzalloc_obj(*mst_conn); + if (!mst_conn) + return NULL; + + connector = &mst_conn->connector; + rc = drm_connector_dynamic_init(dev, connector, + &msm_dp_drm_mst_connector_funcs, + DRM_MODE_CONNECTOR_DisplayPort, NULL); + if (rc) + goto err_free; + + mst_conn->dp_mst = mst; + + drm_connector_helper_add(connector, &msm_dp_drm_mst_connector_helper_funcs); + connector->funcs->reset(connector); + + /* add all encoders as possible encoders */ + for (i = 0; i < mst->max_streams; i++) { + rc = drm_connector_attach_encoder(connector, mst->mst_encoders[i].enc); + if (rc) { + drm_err(dev, "[MST] failed to attach encoder:%u to conn:%d rc:%d\n", + mst->mst_encoders[i].enc->base.id, + connector->base.id, rc); + goto err_connector; + } + } + + mst_conn->mst_port = port; + drm_dp_mst_get_port_malloc(port); + + drm_object_attach_property(&connector->base, + dev->mode_config.path_property, 0); + drm_object_attach_property(&connector->base, + dev->mode_config.tile_property, 0); + drm_connector_set_path_property(connector, pathprop); + + drm_dbg_kms(dev, "[MST] add_connector done conn:%d max_streams:%u\n", + connector->base.id, mst->max_streams); + + return connector; + +err_connector: + drm_connector_cleanup(connector); +err_free: + kfree(mst_conn); + return NULL; +} + +static const struct drm_dp_mst_topology_cbs msm_dp_mst_drm_cbs = { + .add_connector = msm_dp_mst_add_connector, +}; + int msm_dp_mst_init(struct msm_dp *dp_display, u32 max_streams, struct drm_dp_aux *drm_aux) { struct drm_device *dev = dp_display->drm_dev; @@ -285,6 +516,7 @@ int msm_dp_mst_init(struct msm_dp *dp_display, u32 max_streams, struct drm_dp_au if (!mst) return -ENOMEM; + mst->mst_mgr.cbs = &msm_dp_mst_drm_cbs; mst->msm_dp = dp_display; mst->max_streams = max_streams; mst->dp_aux = drm_aux; -- 2.43.0