From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A258B41C2FE for ; Mon, 29 Jun 2026 14:16:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782742602; cv=none; b=qgaH+c+p57u+glZF7OM6iBe3he3IA952OpkzACq9FIPSOuaqI4BXqeA6V0NDbDnmXjGAO3oMKmy42FlryI05PUEcMV0cgQAJcZgbNT7+y61M3g8HH0f6K8zomRrXA1yhJmduqB17eMrfPl64foSba3WW/ZyOw8DFtfEzZJc3mMU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782742602; c=relaxed/simple; bh=M8HporrHR4TroPqsNLp1fnzaVZtixFKytOyYesj4iZk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=XJdOKQwZG8Z+33VrU8R3HUkpW/ZQuPzx5o+KiO5Kk922/Z0gM0Y70UiniWkEBcEicxl8lJ2nNBdYlEwoZ1KcVFgGDo48V+5KjFWsNUFaCUnqX+Q2Gl+YfsHUJ6ZM4hUVEAOhwAvgWDPhO4EjqM9Wh0Mh3HYzNwMfAr7Ap+eKkPY= 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=GrtZ5hlf; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=eMoeFLDU; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="GrtZ5hlf"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="eMoeFLDU" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65TATJwx2656106 for ; Mon, 29 Jun 2026 14:16:39 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= hZJyjmKYjOSNQb7RA0taR2J0lFRDRngR4/4RIKL4IXo=; b=GrtZ5hlfGt7Fo2jH KYdYhZagYISOsKafHAae+WA9W7lZts5Mw1ZKnG1jrRwowQ3eN7wNAhrk+GWMidfa 87C5jj/fs/sfmMdN3GZGf2pqZUOAnB87raPfHblefpSs4kT3hfvv8iBEZUI2mZYq hcEToKorsc5BoYX1k4i0JU9Ll8Lf6XYkc0VPnR7BzsUiS7lKC7imXzhZFuACwzF7 SGiZykKobnMqTJKZe4bndiV1Ga83K8J8qu7Cthrs0V+zQKfhJ9zZwCpVAqwPIlUt PZlLjyD/1XgBIvOqNR2x32YswgajN5Dof4qAFea0q8ZL7i1QOjGMHFMGqec7pgIF dU+Q5A== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4f3np7h71d-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 29 Jun 2026 14:16:39 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-92af3d5e85aso734197185a.0 for ; Mon, 29 Jun 2026 07:16:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782742599; x=1783347399; 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=hZJyjmKYjOSNQb7RA0taR2J0lFRDRngR4/4RIKL4IXo=; b=eMoeFLDUJ1FwPsS+yd5PnvIZrJgUBsDIdjPWNc89TA4JyKCRirMql+/50GdvvFPhns r7wqgeuWspsqR9BSQmpiowY5ZbRI9TU6cfP0aAJSG7s5TfIuF/XB2IP37ARcvo8vEABc pvWmss1v1jrt9pqgpvv5muJk4k9Rrz3h2T0N7GZibtaEEfMPQAiCxIgtnRuKud2tNc1Y jrwPhkhvyni9XEhzPiKKkEI/5qeUNp6OHUVp+Lnmjnpt9//2wblP7YyzuKV3B1aqQmXC WlkEtP4D2hZ3PZdEGfI/jUpZ8tldKRQYruLTZ2UQZJIyj6iJ4mjzBOL1yGxcOCOxysh1 cNSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782742599; x=1783347399; 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=hZJyjmKYjOSNQb7RA0taR2J0lFRDRngR4/4RIKL4IXo=; b=KPwgnLd9hair/txGls9ca6wlcHLaq3uQWsLzu78GSdFzm06CBpqyJ/f4f4evGs3ulj fgQtqJJu/pJ7UPizIx/L/9q29yBIN+/oEzTme8h/QOmdGFdgb99UBR0HZy8mMdQHYIhn 4iuEkqjNPadSu1GbB4tpn7chcVwaAiZ9PCnprO7RDu7dDF7E8ScjsTs268aQccE/DWTB OKqSyHnQvnQubZnncw/7XrqLpmv9UfuMetRJxDFk7fAqyvtgSfiI8upY4Jo62OIHwxOl NDbUuaFi36Or+9o6nhXMw7u/pPovwvpsBHNQ7We34MU7NBGdilolY6aMe3/CO0zPX2/u INfQ== X-Forwarded-Encrypted: i=1; AFNElJ9YpVzyNM3cxtexZkzqzQzoMKyXaLRagX2wnZNQ6N+rXtPVJ9YybYBve4n3fA32vlG9Rub7DTBE6BQwVUg=@vger.kernel.org X-Gm-Message-State: AOJu0YxwH71wcHx7pRYeUW4abGfpIusjl2jxX+v55mDVYR+bwJaqExjd dAmnlwxx/dTdErjHkGYOtBFvTUXSNBhNOHi3QHXF5/kNenkIE524h+i4W6EZq8Rphigb2nbg70R TRC1UPxoec2flxzA3O3V0tEQxzJ9E9LViPd/OVi/wbsFUaWHfU6S8UNJ2u7Ov7Kq0nQQ= X-Gm-Gg: AfdE7cl7r5mP7JgBChetEgpPM/f7krKDP2LsVyUvV0W/flW0n+kKWyw6EBORtTcls3A jRkBURA0I7PdT0Z6nKjpR04EMJ7RvQf4w0R6CJo1/g7ptp8puDXmni9l9SkgP98S6FjlRTt2+kk kSHgtBXSJrIKIjvht3ICzR4rnkgQwriauv0Hzo/RgYBrII+5ylqdem9qc2vHxwSDI0EkKntcBK0 bzpgvr3NVNG/O51wBQkWBTcXJz1fSmRTIXZubIADJPNG81X+p9LkGhi+8AlglRW5roNcKC6M6jv wjkQDEv7s/Xg7pGj/1L1GdjOmyi+HOzBfEijMVeW4gln8L4UuDeMBWCEUwnd1NTraIPGg7s5YRv xgiwWxLPzg2KdxXAjzUS4YCo9t2BJzk4yPtAjBU4VrUdKpzpLaYDlK6st3s12mZYdRJAPPw== X-Received: by 2002:a05:620a:4409:b0:915:8502:f7fc with SMTP id af79cd13be357-9293a6b149dmr2490994785a.16.1782742598590; Mon, 29 Jun 2026 07:16:38 -0700 (PDT) X-Received: by 2002:a05:620a:4409:b0:915:8502:f7fc with SMTP id af79cd13be357-9293a6b149dmr2490988785a.16.1782742598029; Mon, 29 Jun 2026 07:16:38 -0700 (PDT) Received: from yongmou2.qualcomm.com (Global_NAT1_IAD_FW.qualcomm.com. [129.46.232.65]) by smtp.gmail.com with ESMTPSA id af79cd13be357-9260079070bsm2143165885a.40.2026.06.29.07.16.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 07:16:37 -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, Dmitry Baryshkov Subject: [PATCH RESEND v5 18/25] drm/msm/dpu: initialize encoders per stream for DP MST Date: Mon, 29 Jun 2026 22:14:39 +0800 Message-ID: <20260629-msm-dp-mst-v5-18-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=2431; i=yongxing.mou@oss.qualcomm.com; s=20250910; h=from:subject:message-id; bh=M8HporrHR4TroPqsNLp1fnzaVZtixFKytOyYesj4iZk=; b=lIVxLBznHHgdMi6x0uKdG+bKoS0Cn3KqoZrNI2q82E5yBFPEaiWOGengt+Qhfx+QPw9ePWBkW dm9FD0D9McxCYC3FlVyKh2eVWP7U7ptF2zGAsynxKpcfiJnCadTsdBn X-Developer-Key: i=yongxing.mou@oss.qualcomm.com; a=ed25519; pk=rAy5J1eP+V7OXqH5FJ7ngMCtUrnHhut30ZTldOj52UM= Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjI5MDExOCBTYWx0ZWRfXxsDyIMlGAGUg PoQy6EI1AwxaEigxuhReSuT6TpU9PqRJL53xG7IoevTSClUGVhTpldg+JDkSG6Ynmi4gSCdmOFw /hD5bGQAEQoJTrGidgeyDo1k/IlHr0Ahv7bNeF0ImsnS4NOMHBgpJpV1/rfZMSKYQnyQr2tPBOU HajlNjmnvSzPDQ0joDrrimoNKC6+NdNdxrRMa1GjNvZfpbX7El0xyxJ0QXmPJi6v4ZVSZ4Gd3U0 lCSfFP84zbwp5e+vCOCvIzsON+ErAfyLspOeHx9+9zbgKt0OJTiD7J4xcWKry+ZJh7sxmAk9Glk J0UtkLNRqtb3ONdtWE0K/TYz8vVcZKPhTvE8LJUHNNQeeNZrKElKvUlpv7Eauin5jTj04v3sen3 f4x9bjkV1kXCfcy5TcPBHlkj5jZF+ua2JznBuCtRmXg4q91Ahy/OJ5Jxnlmygi2/P+QMhWsa/N2 c3ZllbnO0INfAJ3otxA== X-Proofpoint-GUID: kk9xWQlNdn-DAlwOKEsGMKDmUyGGfOLj X-Proofpoint-ORIG-GUID: kk9xWQlNdn-DAlwOKEsGMKDmUyGGfOLj X-Proofpoint-Spam-Info: AW1haW4tMjYwNjI5MDExOCBTYWx0ZWRfX9xLEpy/mmRz/ k0njdLAqzkJz3z1/eVXtXzi6out2GkTDenlsxvN0NGxVpGQTPtTz19cDyExlTVesNYQxgMP1oVp YlUGb3x8Bk4KylC4CtGkJDTAIfXMmfU= X-Authority-Analysis: v=2.4 cv=OcWoyBTY c=1 sm=1 tr=0 ts=6a427e47 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=C3Dk8TwHQYyIj7nOf9RCJw==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=CHjaKMol-vWaWBnFkvwA:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 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 lowpriorityscore=0 adultscore=0 spamscore=0 clxscore=1015 phishscore=0 bulkscore=0 suspectscore=0 impostorscore=0 malwarescore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606290118 Simply initialize MST encoders for MST-capable DP controllers, and introduce msm_dp_get_mst_max_stream to query MST streams. Signed-off-by: Yongxing Mou Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 14 +++++++++++++- drivers/gpu/drm/msm/msm_drv.h | 7 ++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index da3556eb6ecc..7a00c4094d5c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -655,7 +655,7 @@ static int _dpu_kms_initialize_displayport(struct drm_device *dev, struct msm_display_info info; bool yuv_supported; int rc; - int i; + int i, stream_id, stream_cnt; for (i = 0; i < ARRAY_SIZE(priv->kms->dp); i++) { if (!priv->kms->dp[i]) @@ -678,6 +678,18 @@ static int _dpu_kms_initialize_displayport(struct drm_device *dev, DPU_ERROR("modeset_init failed for DP, rc = %d\n", rc); return rc; } + + stream_cnt = msm_dp_get_mst_max_stream(priv->kms->dp[i]); + + if (stream_cnt > 1) { + for (stream_id = 0; stream_id < stream_cnt; stream_id++) { + encoder = dpu_encoder_init(dev, DRM_MODE_ENCODER_DPMST, &info); + if (IS_ERR(encoder)) { + DPU_ERROR("encoder init failed for dp mst display\n"); + return PTR_ERR(encoder); + } + } + } } return 0; diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index c3fb3205f683..5fee0b291059 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -355,7 +355,7 @@ bool msm_dp_is_yuv_420_enabled(const struct msm_dp *dp_display, bool msm_dp_needs_periph_flush(const struct msm_dp *dp_display, const struct drm_display_mode *mode); bool msm_dp_wide_bus_available(const struct msm_dp *dp_display); - +int msm_dp_get_mst_max_stream(struct msm_dp *dp_display); #else static inline int __init msm_dp_register(void) { @@ -372,6 +372,11 @@ static inline int msm_dp_modeset_init(struct msm_dp *dp_display, return -EINVAL; } +static inline int msm_dp_get_mst_max_stream(struct msm_dp *dp_display) +{ + return -EINVAL; +} + static inline void msm_dp_snapshot(struct msm_disp_state *disp_state, struct msm_dp *dp_display) { } -- 2.43.0