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 C12F338F945 for ; Wed, 26 Aug 2026 07:49:19 +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=1787730561; cv=none; b=o0vv3M3k+BGWPieqlGa9quutpAz4nuWXyZYmeh/HfIybEz41lENtVEkvWBPwvCb/RT9omxQb+tA7v2MehOpSX8wlq5nBt55kfNH6C63KTExSMOpLKbLbafSXFFqDYkEuchM/CGebWM+ZhbYJ8aF1pwIH3iIzfamNfclhxgDGAQA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787730561; c=relaxed/simple; bh=57S0b3Uju4otbJ/vTQYhL9qni3w2zEnVxPW1NpD6sT0=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=HdRUmL1kp5zaZAGlCKUZBIO4BUd0a00hhLqyNudBno5xf7Mh6zPPZ5dY3m1JB9/NEOtmRUyeh1XdN/KBxhGcrHZaAX6QwnuUqDXQwLDufDd5Gjyvc7lpGkx8B4ucG1y+qC+wEIK3zXY9ftGpOLvZIJUe7t7RwOA+gRows/fZDew= 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=WpXfvZgt; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=RzLK7+35; 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="WpXfvZgt"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="RzLK7+35" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67Q6RqwL3210730 for ; Wed, 26 Aug 2026 07:49:19 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= 6DCmBsvDeuI8ABH6xP2YOY9HZossfW23sCzfnm22eqE=; b=WpXfvZgtvPv32iNy or8PX7JwoUsUHI2qkxa0vBHZbtCqriiINVxk6ttQ5HEGTvPv3kPeB55hgFucoheu P6k/66bSkxasHh5MiMWg/nS8PIeqDst4hC2QL2Wtc0TvfAK5wy+P1paFKzJgrMlV 4jC+oLmtGFDkCEVfYtznyyNHJN6fMu4x9y2alZzle80HFK6xZoxFvtuCGhWXdp9w iw8dp2Nj4cieL07X3109rxTs5/p8u+rhzNlF4Q+/WOKKm8h+vRw4PrRkl2FAA3Lc LKqK9Q/FCHGqrXCa3qHW4KvfIV1n1CN675+RhRZis5RuUjt6H/WlNKXjc+r7JjSE +/hxgw== Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g9fgras62-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 26 Aug 2026 07:49:19 +0000 (GMT) Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-8544b721ce9so36964b3a.1 for ; Wed, 26 Aug 2026 00:49:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1787730558; x=1788335358; darn=vger.kernel.org; h=content-transfer-encoding:content-type: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 :content-type; bh=6DCmBsvDeuI8ABH6xP2YOY9HZossfW23sCzfnm22eqE=; b=RzLK7+35/Eh12msPgbSrYUzApWTA+4XEdEzp94ndYn4Cb8qZasxuNLypECVmg/ODKp a/l9wZS4WK/gSBwx0fTGhqpW4IQNNWqhGAeg5lKd2jxoMejk3h6eamwTKa/pLUnl2LiU lZIvz4cJvVMpjydAjd2jvXs7O/wpniZtcldt7z+7G6yVTj/JBmyvBNZRS9ofqRtPgirl j/w5LP/0SneBcYShVgMHa//yQFdWJD5/gvyudNeNNARfnF2E8X964Hifydayyc/HJSJJ 06TeDTzThASY4svwNuZJVQNEOoWfA1TV9pz0HtZgDcPqWiNwfLpYV8f4Yy2sh42EBUpK NMyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787730558; x=1788335358; h=content-transfer-encoding:content-type: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:content-type; bh=6DCmBsvDeuI8ABH6xP2YOY9HZossfW23sCzfnm22eqE=; b=HdqRTrw+VC3OTNFNxZ7bq/j1e24K4RCtdsnLHJ8J7dYZ436gjyVkCDIabxJozX+LYd ZlEIhWkAk7W0gPEQm+pUq/TwxrLigRrsTcA+n8vs/skvTvm8FRE3Clr6RO+fpaUOSDPL fkBTJ6h3IXkY96CIc48pij4EZFheB6LKSoYT9br4QalUfEXyP7QH81i/pfZfBlfpwGBn mnAsguTE5qB7+//L9CQ3b02kdoWzJ+O4JXWayqWpyrYWdaOwqbEkJl1TP7N+xQ1M3KJP vYpZTZsycGoqAu/AB2jp9eZitw+lrL7YbPOjxkTMdZ5YezfSb/O4nKvYRwXo9dtm0w0V 42jQ== X-Forwarded-Encrypted: i=1; AHgh+Rolme9Uj1Ntg30ZbDwdYg25mLnt3yC5zoKBhNoEWJUUQ+z0SpyYaiyWJhaCGYZ3e6H2dcfw75frh/TbQc8=@vger.kernel.org X-Gm-Message-State: AFuF++k6ynSL1YeVt6Sr/BAwLVfP7RT2b4cpaHDflihi07lWg28zbNqX 6T7phFHGPC8VRXq4x4uiDzMmv2X8wpj4TAoUoOfr8lR4bzyczjREwvTrtFZR11YGDu+VaAqeTDD GGAlz8MJ6tvk8dkz6RvOZSguQ6T3X80rFaz4SWTVRcsgfs+6rmMiZXfC3iE87DrSdLps= X-Gm-Gg: AR+sD13cK4VVZq/9g5086+B3jbRWsGH64p4AQ5OT59TbVC8DqNPXhLFpDEBzWXpdLEJ bpz8T8lvUqdwpgWeNleqabtzcDmwkA2hTIrboZtYpXQw8HqJvMeoSsBxL03bEcxfJp7ixDkTa+X nNm32F6dCwZKQGgHAxt46hxkfG29dnMzbjpV541g4DCwlz2VdvcLugxwjjFnDIxsv07DEEfpgiZ iHPjNhcgYfjvfox/WxfFnSe56k/2z6pj+/NWZHw+3LO+yc0mI/VK3xJz9/aLrxENZGmDQwEzpxe p56tCry6fcCPe4NX8qCLvFW233aoFYZcZO2OisenIz9CsUDc8DOQIxApkgV+u57ul4te0TBjSGl mP4bkw1sIOGTv+faZcTXWylZdOyJjG3SAI/86c9sDyOyok+hGSi3FVx9nKlJ1WFbiOQkDq/5O X-Received: by 2002:a05:6a00:4216:b0:851:b03a:fcb with SMTP id d2e1a72fcca58-85374bbae36mr9760671b3a.14.1787730558315; Wed, 26 Aug 2026 00:49:18 -0700 (PDT) X-Received: by 2002:a05:6a00:4216:b0:851:b03a:fcb with SMTP id d2e1a72fcca58-85374bbae36mr9760557b3a.14.1787730557806; Wed, 26 Aug 2026 00:49:17 -0700 (PDT) Received: from [10.133.33.101] (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8535cd8a41esm588474b3a.29.2026.08.26.00.49.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Aug 2026 00:49:17 -0700 (PDT) Message-ID: <06462446-9a80-4c41-a882-59f19f6a5ccc@oss.qualcomm.com> Date: Wed, 26 Aug 2026 15:49:10 +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 RESEND v5 23/25] drm/msm/dp: add dp_mst_drm to manage DP MST encoder 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: <20260629-msm-dp-mst-v5-0-2ed6aee1867a@oss.qualcomm.com> <20260629-msm-dp-mst-v5-23-2ed6aee1867a@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: 8bit X-Proofpoint-GUID: gbrw3kXyWC_k2Du_SqZMNuii6Wq43uS8 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI2MDA2MyBTYWx0ZWRfX5UndqXZPY2/c JyvcB+UttgblFX78AH0yrzdk3Vg9EQlqrOTrHdcvAmBBTs2r6DtdV4JVt8P2ik7Xf6PH/ZzlLWq 6CasipbYnvkFiXWPWxTnAcuhNuBu3G4YgcXa6XWQUFKOYbGzopvqKmXrphpWDnb39g11QZ9y6tN G5ujnYRJ4ppb15Ioo0XI9t2fJci12D/RBaDCQJNow6gFu+nCvl1Z4MmrEcORNwGvIXDqAaoF97q makxUCGomqADgU1vYE65QdsUPZmWlwJR8bvuEl++4dpsyg1+c1tOHgasUA+Y53O209aQLhr4WfX Y5bj4g79GajUxIPIrgZHIt7fZ/Yx0tA/7/mCBDptr2ywMTWwjRv5Yb7hjKwTx+VSRwu4YhfzHlE /GS264Or7+HV8uJut85S6bb3d4nbnvVjBC2aIKzm069nNnuqoNpMYUO/YrSG1tZVdzb3QaaLInl c0mHox5PXEDXu5NirCA== X-Authority-Analysis: v=2.4 cv=d8LFDxjE c=1 sm=1 tr=0 ts=6a8e9a7f cx=c_pps a=rEQLjTOiSrHUhVqRoksmgQ==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=QDH60ZEL_tEWVS7y0fAA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=2VI0MkxyNR6bbpdq8BZq:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-ORIG-GUID: gbrw3kXyWC_k2Du_SqZMNuii6Wq43uS8 X-Proofpoint-Spam-Info: AW1haW4tMjYwODI2MDA2MyBTYWx0ZWRfX3uAGyAb5eqeq v7nwvAtA5xQldHLTKcVdRBpH1P3cAqiO3nHl94colEOjIBMp0mGzpEWvL56h5o41IupadE9A6PA 2WlbpjiVFvS8XZKFJfPY2y9siL+jURk= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-26_02,2026-08-24_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 phishscore=0 malwarescore=0 suspectscore=0 lowpriorityscore=0 bulkscore=0 priorityscore=1501 adultscore=0 spamscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608260063 On 7/13/2026 8:40 AM, Dmitry Baryshkov wrote: > On Mon, Jun 29, 2026 at 10:14:44PM +0800, Yongxing Mou wrote: >> drm/msm/dp: introduce dp_mst_drm for MST stream management > > duplicate subject? > >> >> Add a dp_mst_drm layer to manage DP MST streams with a clear ownership >> model between encoder, panel and connector. >> >> Each MST stream is represented by a dedicated drm_encoder. At modeset >> initialization time, one (encoder, dp_panel) pair is created per >> stream_id and remains fixed for the lifetime of the driver. The >> dp_panel thus carries a stable stream context, including stream_id >> and pixel mapping. >> >> MST connectors are created and destroyed dynamically on hotplug and >> are attached to a dp_panel through atomic routing. During an atomic >> commit, connectors are associated with encoders via >> atomic_best_encoder(), forming a temporary binding for the duration >> of the commit. > > This doesnt't seem to be true any longer. > Got it. will modify commit message next version. >> >> Encoder helper callbacks drive the MST stream lifecycle, including >> timeslot allocation, link enable/disable and payload programming. >> >> A per-MST-instance lock serializes operations on shared link state >> across multiple streams. >> >> 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_display.c | 9 ++ >> drivers/gpu/drm/msm/dp/dp_display.h | 2 + >> drivers/gpu/drm/msm/dp/dp_mst_drm.c | 245 ++++++++++++++++++++++++++++++++ >> drivers/gpu/drm/msm/msm_drv.h | 7 + >> 5 files changed, 269 insertions(+) >> >> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c >> index b32ecd5b0777..ac5dc844fead 100644 >> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c >> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c >> @@ -696,6 +696,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 attach_encoder failed, rc = %d\n", rc); >> + return rc; >> + } > > Reoder, this should be a part of the patch, adding the encoder. > Got it. >> } >> } >> } >> diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c >> index fc9c1e3e57ab..6eac390af2e0 100644 >> --- a/drivers/gpu/drm/msm/dp/dp_display.c >> +++ b/drivers/gpu/drm/msm/dp/dp_display.c >> @@ -601,6 +601,15 @@ struct msm_dp_panel *msm_dp_display_get_panel(struct msm_dp *msm_dp_display, >> return dp_panel; >> } >> >> +void msm_dp_display_set_link_info(struct msm_dp *msm_dp_display, >> + struct msm_dp_link_info *dst) >> +{ >> + struct msm_dp_display_private *dp = >> + container_of(msm_dp_display, struct msm_dp_display_private, msm_dp_display); >> + >> + memcpy(dst, &dp->panel->link_info, sizeof(*dst)); >> +} >> + >> static void msm_dp_display_deinit_sub_modules(struct msm_dp_display_private *dp) >> { >> msm_dp_audio_put(dp->audio); >> diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h >> index a185819ec57e..fb6bdd372b52 100644 >> --- a/drivers/gpu/drm/msm/dp/dp_display.h >> +++ b/drivers/gpu/drm/msm/dp/dp_display.h >> @@ -63,4 +63,6 @@ void msm_dp_display_unprepare(struct msm_dp *dp); >> >> struct msm_dp_panel *msm_dp_display_get_panel(struct msm_dp *msm_dp_display, >> enum msm_dp_stream_id stream_id); >> +void msm_dp_display_set_link_info(struct msm_dp *msm_dp_display, >> + struct msm_dp_link_info *dst); >> #endif /* _DP_DISPLAY_H_ */ >> diff --git a/drivers/gpu/drm/msm/dp/dp_mst_drm.c b/drivers/gpu/drm/msm/dp/dp_mst_drm.c >> index 78b8dffe111b..6a77fdef85e9 100644 >> --- a/drivers/gpu/drm/msm/dp/dp_mst_drm.c >> +++ b/drivers/gpu/drm/msm/dp/dp_mst_drm.c >> @@ -4,18 +4,259 @@ >> */ >> >> #include >> +#include >> +#include >> #include >> >> #include "dp_mst_drm.h" >> #include "dp_panel.h" >> +#include "dpu_encoder.h" >> + >> +#define to_dp_mst_connector(x) \ >> + container_of((x), struct msm_dp_mst_connector, connector) >> + >> +struct msm_dp_mst_encoder { >> + struct drm_encoder *enc; >> + int stream_id; >> + struct msm_dp_panel *dp_panel; >> +}; >> + >> +struct msm_dp_mst_connector { >> + struct drm_connector connector; >> + struct drm_dp_mst_port *mst_port; >> + struct msm_dp_mst *dp_mst; >> +}; >> + > > Extra empty line. > >> >> struct msm_dp_mst { >> struct drm_dp_mst_topology_mgr mst_mgr; >> + struct msm_dp_mst_encoder mst_encoders[DP_STREAM_MAX]; >> struct msm_dp *msm_dp; >> struct drm_dp_aux *dp_aux; >> u32 max_streams; >> + struct mutex mst_lock; >> + struct msm_dp_link_info link_info; >> }; >> >> +static struct msm_dp_panel *msm_dp_mst_panel_from_encoder(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].dp_panel; >> + } >> + return NULL; >> +} >> + >> +static void msm_dp_mst_update_timeslots(struct msm_dp_mst *mst, >> + struct msm_dp_panel *panel, >> + struct drm_dp_mst_atomic_payload *payload) >> +{ >> + if (payload->vc_start_slot < 0) >> + msm_dp_display_set_stream_info(mst->msm_dp, panel, 1, 0, 0); >> + else >> + msm_dp_display_set_stream_info(mst->msm_dp, panel, >> + payload->vc_start_slot, >> + payload->time_slots, payload->pbn); > > Can you pass payload as is? Then you don't need a wrapping function. > Yes, we can directly use this. >> + >> + drm_dbg_kms(mst->msm_dp->drm_dev, >> + "[MST] stream:%u timeslots vc_start:%d slots:%d pbn:%d\n", >> + panel->stream_id, payload->vc_start_slot, >> + payload->time_slots, payload->pbn); >> +} >> + >> +static void msm_dp_mst_stream_enable(struct drm_encoder *encoder, >> + struct drm_atomic_commit *state) >> +{ >> + struct drm_connector *connector = >> + drm_atomic_get_new_connector_for_encoder(state, encoder); >> + 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 msm_dp_panel *panel = msm_dp_mst_panel_from_encoder(mst, encoder); >> + struct drm_dp_mst_port *port = mst_conn->mst_port; >> + struct drm_dp_mst_topology_state *mst_state = >> + drm_atomic_get_new_mst_topology_state(state, &mst->mst_mgr); >> + struct drm_dp_mst_atomic_payload *payload = >> + drm_atomic_get_mst_payload_state(mst_state, port); >> + int rc; >> + >> + panel->connector = connector; > > The connector should be _get before assigning. > Got it. >> + >> + guard(mutex)(&mst->mst_lock); >> + >> + rc = msm_dp_display_set_mode_helper(dp_display, state, encoder, panel); >> + if (rc) { >> + drm_err(dp_display->drm_dev, >> + "[MST] stream:%u set_mode failed rc=%d\n", panel->stream_id, rc); >> + goto out; >> + } >> + >> + rc = msm_dp_display_prepare_link(dp_display); >> + if (rc) { >> + drm_err(dp_display->drm_dev, >> + "[MST] stream:%u prepare_link failed rc=%d\n", panel->stream_id, rc); >> + msm_dp_display_unprepare(dp_display); >> + goto out; >> + } >> + >> + 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_err(dp_display->drm_dev, >> + "[MST] payload allocation failure for conn:%d\n", connector->base.id); >> + msm_dp_display_unprepare(dp_display); >> + goto out; >> + } >> + >> + msm_dp_mst_update_timeslots(mst, panel, payload); >> + >> + msm_dp_display_enable_helper(dp_display, panel); >> + >> + drm_dp_check_act_status(&mst->mst_mgr); >> + >> + drm_dp_add_payload_part2(&mst->mst_mgr, payload); >> + >> +out: >> + drm_connector_get(connector); >> +} >> + >> +static void msm_dp_mst_stream_disable(struct drm_encoder *encoder, >> + struct drm_atomic_commit *state) >> +{ >> + struct drm_connector *connector = drm_atomic_get_old_connector_for_encoder(state, encoder); >> + struct msm_dp_mst_connector *mst_conn = to_dp_mst_connector(connector); >> + struct msm_dp_mst *mst = mst_conn->dp_mst; >> + struct msm_dp_panel *panel = msm_dp_mst_panel_from_encoder(mst, encoder); >> + struct drm_dp_mst_topology_state *old_mst_state = >> + drm_atomic_get_old_mst_topology_state(state, &mst->mst_mgr); >> + struct drm_dp_mst_topology_state *new_mst_state = >> + drm_atomic_get_new_mst_topology_state(state, &mst->mst_mgr); >> + struct drm_dp_mst_atomic_payload *old_payload = >> + drm_atomic_get_mst_payload_state(old_mst_state, mst_conn->mst_port); >> + struct drm_dp_mst_atomic_payload *new_payload = >> + drm_atomic_get_mst_payload_state(new_mst_state, mst_conn->mst_port); >> + >> + guard(mutex)(&mst->mst_lock); >> + >> + 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, panel, new_payload); >> + >> + msm_dp_display_disable_helper(mst->msm_dp, panel); >> + >> + drm_dp_check_act_status(&mst->mst_mgr); >> +} >> + >> +static void msm_dp_mst_stream_post_disable(struct drm_encoder *encoder, >> + struct drm_atomic_commit *state) >> +{ >> + struct drm_connector *connector = drm_atomic_get_old_connector_for_encoder(state, encoder); >> + struct msm_dp_mst_connector *mst_conn = to_dp_mst_connector(connector); >> + struct msm_dp_mst *mst = mst_conn->dp_mst; >> + struct msm_dp_panel *panel = msm_dp_mst_panel_from_encoder(mst, encoder); >> + >> + guard(mutex)(&mst->mst_lock); >> + >> + msm_dp_display_atomic_post_disable_helper(mst->msm_dp, panel); >> + >> + if (!mst->msm_dp->mst_active) >> + msm_dp_display_unprepare(mst->msm_dp); >> + >> + panel->connector = NULL; >> + >> + drm_connector_put(connector); >> +} >> + >> +static int msm_dp_mst_enc_atomic_check(struct drm_encoder *enc, >> + struct drm_crtc_state *crtc_state, >> + struct drm_connector_state *conn_state) >> +{ >> + struct msm_dp_mst_connector *mst_conn = to_dp_mst_connector(conn_state->connector); >> + struct msm_dp_mst *mst = mst_conn->dp_mst; >> + struct drm_dp_mst_topology_state *mst_state; >> + int bpp, pbn, slots; >> + >> + if (!conn_state->crtc) >> + return 0; >> + >> + if (!drm_atomic_crtc_needs_modeset(crtc_state) || !crtc_state->active) >> + return 0; >> + >> + bpp = (conn_state->connector->display_info.bpc * 3) ?: 24; /* fallback: assume 8bpc */ >> + pbn = drm_dp_calc_pbn_mode(crtc_state->mode.clock, bpp << 4); >> + >> + mst_state = drm_atomic_get_mst_topology_state(crtc_state->state, &mst->mst_mgr); >> + 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->link_info.rate, >> + mst->link_info.num_lanes); >> + } >> + >> + slots = drm_dp_atomic_find_time_slots(crtc_state->state, &mst->mst_mgr, >> + mst_conn->mst_port, pbn); >> + if (slots < 0) >> + return slots; >> + >> + return 0; >> +} >> + >> +static void msm_dp_mst_enc_atomic_enable(struct drm_encoder *enc, >> + struct drm_atomic_commit *state) >> +{ >> + msm_dp_mst_stream_enable(enc, state); >> + dpu_encoder_phys_enable(enc, state); > > Looking at this, no, squashing the bridge and the encoder was not a good > idea, excuse me. The encoder is an internal implement of the DPU layer > and we should leave it there as is. DPU can use DP functions, but not > other way around. > We could also invoke it from dpu_encoder.c, similar to how the MST encoder helper functions are handled: static const struct drm_encoder_helper_funcs dpu_mst_encoder_helper_funcs = { .atomic_check = dpu_encoder_mst_atomic_check, .atomic_mode_set = dpu_encoder_virt_atomic_mode_set, .atomic_enable = dpu_encoder_mst_atomic_enable, .atomic_disable = dpu_encoder_mst_atomic_disable, }; ...... if (drm_enc_mode == DRM_MODE_ENCODER_DPMST) drm_encoder_helper_add(&dpu_enc->base, &dpu_mst_encoder_helper_funcs); ..。。。。。 This looks much better. >> +} >> + >> +static void msm_dp_mst_enc_atomic_disable(struct drm_encoder *enc, >> + struct drm_atomic_commit *state) >> +{ >> + msm_dp_mst_stream_disable(enc, state); >> + dpu_encoder_phys_disable(enc, state); >> + msm_dp_mst_stream_post_disable(enc, state); >> +} >> + >> +static const struct drm_encoder_helper_funcs msm_dp_mst_encoder_helper_funcs = { >> + .atomic_check = msm_dp_mst_enc_atomic_check, >> + .atomic_mode_set = dpu_encoder_atomic_mode_set, >> + .atomic_enable = msm_dp_mst_enc_atomic_enable, >> + .atomic_disable = msm_dp_mst_enc_atomic_disable, >> +}; >> + >> +int msm_dp_mst_attach_encoder(struct msm_dp *dp_display, struct drm_encoder *encoder) >> +{ >> + struct msm_dp_mst *mst = dp_display->msm_dp_mst; >> + struct msm_dp_panel *dp_panel; >> + int i; >> + >> + for (i = 0; i < mst->max_streams; i++) { >> + if (!mst->mst_encoders[i].enc) >> + break; >> + } >> + >> + dp_panel = msm_dp_display_get_panel(dp_display, i); >> + if (!dp_panel) { >> + drm_err(dp_display->drm_dev, >> + "[MST] failed to allocate panel for stream %d\n", i); >> + return -ENOMEM; >> + } >> + >> + mst->mst_encoders[i].enc = encoder; >> + mst->mst_encoders[i].stream_id = i; >> + mst->mst_encoders[i].dp_panel = dp_panel; >> + drm_encoder_helper_add(encoder, &msm_dp_mst_encoder_helper_funcs); >> + >> + return 0; >> +} >> + >> 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; >> @@ -27,6 +268,9 @@ int msm_dp_mst_display_set_mgr_state(struct msm_dp *dp_display, bool state) >> "[MST] failed to set topology mgr state to %d rc:%d\n", state, rc); >> } >> >> + if (state) > > Why? > At the moment, link_info is maintained in the SST panel. After link training is completed, we need to propagate a copy of it to the MST context. >> + msm_dp_display_set_link_info(dp_display, &mst->link_info); >> + >> drm_dbg_kms(dp_display->drm_dev, "[MST] set_mgr_state state:%d\n", state); >> return rc; >> } >> @@ -55,6 +299,7 @@ int msm_dp_mst_init(struct msm_dp *dp_display, u32 max_streams, struct drm_dp_au >> return ret; >> } >> >> + mutex_init(&mst->mst_lock); >> dp_display->msm_dp_mst = mst; >> return 0; >> } >> diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h >> index f71200a790f3..854dd08eede2 100644 >> --- a/drivers/gpu/drm/msm/msm_drv.h >> +++ b/drivers/gpu/drm/msm/msm_drv.h >> @@ -358,6 +358,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) >> { >> @@ -384,6 +386,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 >> >