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 1E851377EA7 for ; Fri, 10 Apr 2026 09:34:19 +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=1775813662; cv=none; b=AQ1fFqHnQCK6RfbKUOetGUomUo/f37XDEFULC/iYSPTIJXX5YKT7f32tT3ke5yIus3ZzLMOMpSE7zUAsR2ZCazHIaj+Az3Qka8Llskyib4wjacFpNlzzBEWLm8aaRzADDZa9lEV3JCnDo5SbXltOROhtwu+uCNimdoO2XjITUDs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775813662; c=relaxed/simple; bh=DmfXjCm5CMc9QUMbnkHNM0IxZcwbFs2CBGArGw/Idno=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bZkQq+RtfxavbmKfciniCmXSZWpE5HbPTa/crVU17BD/MT8+DjJpdlBOLpY1QDc/RkYrxA9Mt/Kchz/FpDLlYeLn0XoXO0svr/QEyD5kr2zQ/fwfeVuT/hFtf8axbfSpt69fY6DeijJaw6hOV6lki+Z4L4tS/fN8tJLlnbi5sX0= 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=Stg8oHdj; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=CeS9R3g5; 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="Stg8oHdj"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="CeS9R3g5" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 63A5c4rd3352764 for ; Fri, 10 Apr 2026 09:34: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= F2gVsfBAP/XpmUtHNNyA77JIrx7z8UN1Bp+hGLyI0/U=; b=Stg8oHdjET5MPOkU 4gWNncsfQLtc1OrCvgJKfKLEo5Gwf+HIrJgDrhIgi9aY1bHbYYUfexGSKr4+zS64 KZ+GRPJG9fXTptpOEhaNtLvH4ruy02MouSziu02NRmZsfGmhYvQPvgwcU0//PWzW /SvQJAps5u+jhZToWzCIrQr1JT2CxPt/KCg5ahsXN2BqiSRsZ6Sj1TMmcbiNtTH9 m3uJeHyE5j4kuJDNSbNjl6NcsnotftraUVfl9uDnEWUbyUp+W5z0xYAiQswfgmLN QrtQOvouN25rYUXQ8lLJ3AlNb5GDCnf/KIAunsM4L8mO33fvigOXEeLT04zV6fnJ vOx7Gw== Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4dec1quv3x-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 10 Apr 2026 09:34:19 +0000 (GMT) Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-8abd6e281c0so43048996d6.1 for ; Fri, 10 Apr 2026 02:34:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1775813658; x=1776418458; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=F2gVsfBAP/XpmUtHNNyA77JIrx7z8UN1Bp+hGLyI0/U=; b=CeS9R3g57On6/ZjdelMXJmRA80nry1z1v3Ws8ManEmNZtIUosuAd2f+o2qYRDbHR9Y 74mUAP9H+ILEV4SseiyVArK1KyBsHXqqaNDevQ4gqmGIcEvanSIEaDvJQZXham43Auc4 XiQNMeBM6FlssLQh/bP64s1Iavt6wboVvyr4g6jSp/Nsj9hmpKVh9o9Al0Xj7d9v3CJJ zBYu6ejCSwuAAc613B9bCqZG5il1helSChU0h9QSjQM1BNMsYaEJKok5xfh7INRlnhr/ WYNYH1+niGFuNR9XLjGgMDUyemrGfNbxDGU9Dq65/9DyIaujme1mDf3CTbQo7t6+4nSY tt/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775813658; x=1776418458; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=F2gVsfBAP/XpmUtHNNyA77JIrx7z8UN1Bp+hGLyI0/U=; b=oo9aDa5r+HlA+Jbvy6usFyHjsx+FZO4/+KXnvv+EWaOZvzWFHdl98LNNyYY18hV1XB Y2n2Bku8xDzGf3m5MV0yuBScn1TRfpkLblDakEWwacQxjBphduMnv5x0WByefUhl9KXQ uvwBwFN/MXDIBXuFu7xvTStDcMDIAyriq0v/U6mmijz07ajzb2EuOcTeeMotjXD5HF66 8YxggRlZ3ebho7EOOmqjw4+vTBde7Sj1tHaNL9nVAor9+io7TJ0y91Oy0onnXH37PWn1 es9U90TbRqHaPDQ7GsrULGBLgvG0jlu1TFjnK9/0d2rPdMaflrfJEytdApCKO9FZRav+ B7Eg== X-Forwarded-Encrypted: i=1; AJvYcCXo51arkpRpJsLuuBP2QxMpEgmId/iuouj0pm1hsICkQKKvIiFP9FX4skZf8CTwoZ+nn1W+c7B5uhEf9RM=@vger.kernel.org X-Gm-Message-State: AOJu0Yws/gTQJfdjaLGH9QjQaXUOavg2GPR4Wc+yHGHvhs1uVDP29IlL AWgGBZHMhd//SrAQatJbJ1toDRxljwmfy72zjAsz+zTrxdZ5aSD4Z1PGNdEZFu5WtqbNICocdwf OiooL0gchOl1woGepn1v6TLAVgDTiZ0TF75wUTDGRH3JdU3sd2ebI+5T8KEwWdqcOEIU= X-Gm-Gg: AeBDiesDd7ljSKGEa/++V2It1T9I1XGPI/BN1oAPmxhBPgQoACA5UUheJ88LM8km/p7 O5KQevN3kasl7DK1p3g3ce3VBDx9+u8G830b8vFGBkVZGp9VfKEVUrxYgsLSCpDfwGwZZAB3sqZ kvfV2sRyg1YAnYDrczGEAL6paOobMDvmzEgcbKSDLchS5D+pjgDNM7P14gx+U9kw+98sm+svLOb CIRICEaEMuNwxE78tRVeWvfC/S9W630sJSdI4gzB66eUB8Axfd1MObaYId8ItegBcgSnlMTW+6u eyg/TAH89Z4FbGtL8cW7coTswT/0Bbi7GVCejse3hEE1ycQEILlG1b1Hht5DckXa9tW0M5h9A25 lQRf5t29HRDiZCpOdV2/6hy5d2LpWLOjg0lYpLLb04XlpVjResxnbsbL0htes4OKd7PlmITa8aE zvszW7IUU= X-Received: by 2002:a05:6214:524a:b0:89f:c414:8d1e with SMTP id 6a1803df08f44-8ac8630980fmr34280186d6.52.1775813658386; Fri, 10 Apr 2026 02:34:18 -0700 (PDT) X-Received: by 2002:a05:6214:524a:b0:89f:c414:8d1e with SMTP id 6a1803df08f44-8ac8630980fmr34279876d6.52.1775813657980; Fri, 10 Apr 2026 02:34:17 -0700 (PDT) Received: from yongmou2.ap.qualcomm.com (Global_NAT1_IAD_FW.qualcomm.com. [129.46.232.65]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8ac84cb135fsm19223386d6.38.2026.04.10.02.34.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Apr 2026 02:34:17 -0700 (PDT) From: Yongxing Mou Date: Fri, 10 Apr 2026 17:33:40 +0800 Subject: [PATCH v4 05/39] drm/msm/dp: splite msm_dp_ctrl_config_ctrl() into link parts and stream parts 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" Content-Transfer-Encoding: 7bit Message-Id: <20260410-msm-dp-mst-v4-5-b20518dea8de@oss.qualcomm.com> References: <20260410-msm-dp-mst-v4-0-b20518dea8de@oss.qualcomm.com> In-Reply-To: <20260410-msm-dp-mst-v4-0-b20518dea8de@oss.qualcomm.com> 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, Yongxing Mou X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1775813628; l=3675; i=yongxing.mou@oss.qualcomm.com; s=20250910; h=from:subject:message-id; bh=DmfXjCm5CMc9QUMbnkHNM0IxZcwbFs2CBGArGw/Idno=; b=7G5maolJyW03eOOrJe143+E2cKWyrZ1ycbAl/ZXheE5fZZAsi3OHRYzrm1PHPPDxJTT+h0RKX uFRXrK3cxSYADbg4RG8qLETRnSktXeuwyLymw6DeUzJft5BtRV/zQ90 X-Developer-Key: i=yongxing.mou@oss.qualcomm.com; a=ed25519; pk=rAy5J1eP+V7OXqH5FJ7ngMCtUrnHhut30ZTldOj52UM= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDEwMDA4OCBTYWx0ZWRfX227chkJAMUzn nDKu745F4EL7rfpa5dl2G21XX8eoZWWYKwnlvixpqWtDnBl8hgytWc/HOwIfMpDSIQ9gg7YqiV2 lKAIgJjcl24FMl2KTUTpIkgkXHopyyGSoqDFDbdnCDRW7EZTsOoCr+/kShNFYf9VQ+WbcaADrRW UEwGVi+vc/pIcuBlrJezSLzmCAJD3oJtvZYOzulNAac4so0dSD6VqrJNnOjkQpvnP0MvSBtTxAM eTS/f1ikNGllQZX7+aiaxmbBodfRNGRk8Wvhn7J2yE2M44RL3L8HHh5xmFKve3t88Lqwx3kqkcM T6vl020uGJcuY/Ve3rHJZJkYA1Z3Kd4rEgF9CtFFm7+wLQbom87WTERasmRaZh9yhCkcygjjjzO KP8oCKcVF1Cispydyut/WXv2SxKTdU353o8uw0DrUkWbbpBV3GmbseJ0yV2HJBxQXPaNU+kdzwD aflnhdF+2bQ924yRQuA== X-Authority-Analysis: v=2.4 cv=eOcjSnp1 c=1 sm=1 tr=0 ts=69d8c41b cx=c_pps a=7E5Bxpl4vBhpaufnMqZlrw==:117 a=C3Dk8TwHQYyIj7nOf9RCJw==:17 a=IkcTkHD0fZMA:10 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=EUspDBNiAAAA:8 a=N4WGanfLxQUAwF0MUGsA:9 a=QEXdDO2ut3YA:10 a=pJ04lnu7RYOZP9TFuWaZ:22 X-Proofpoint-GUID: hDM4BUPHDwaAgTHTIqvF_fd1NQZ52zHh X-Proofpoint-ORIG-GUID: hDM4BUPHDwaAgTHTIqvF_fd1NQZ52zHh 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-10_03,2026-04-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 adultscore=0 bulkscore=0 suspectscore=0 phishscore=0 impostorscore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604010000 definitions=main-2604100088 The DP_CONFIGURATION_CTRL register contains both link-level and stream-specific fields. Currently, msm_dp_ctrl_config_ctrl() configures all of them together. Separates the configuration into link parts and streams part for support MST. Signed-off-by: Yongxing Mou --- drivers/gpu/drm/msm/dp/dp_ctrl.c | 43 ++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.c b/drivers/gpu/drm/msm/dp/dp_ctrl.c index 476346e3ac19..85315467b5d0 100644 --- a/drivers/gpu/drm/msm/dp/dp_ctrl.c +++ b/drivers/gpu/drm/msm/dp/dp_ctrl.c @@ -388,26 +388,41 @@ void msm_dp_ctrl_push_idle(struct msm_dp_ctrl *msm_dp_ctrl) drm_dbg_dp(ctrl->drm_dev, "mainlink off\n"); } -static void msm_dp_ctrl_config_ctrl(struct msm_dp_ctrl_private *ctrl) +static void msm_dp_ctrl_config_ctrl_streams(struct msm_dp_ctrl_private *ctrl, + struct msm_dp_panel *msm_dp_panel) { u32 config = 0, tbd; + + config = msm_dp_read_link(ctrl, REG_DP_CONFIGURATION_CTRL); + + if (msm_dp_panel->msm_dp_mode.out_fmt_is_yuv_420) + config |= DP_CONFIGURATION_CTRL_RGB_YUV; /* YUV420 */ + + tbd = msm_dp_link_get_test_bits_depth(ctrl->link, + msm_dp_panel->msm_dp_mode.bpp); + + config |= tbd << DP_CONFIGURATION_CTRL_BPC_SHIFT; + + if (msm_dp_panel->psr_cap.version) + config |= DP_CONFIGURATION_CTRL_SEND_VSC; + + drm_dbg_dp(ctrl->drm_dev, "stream DP_CONFIGURATION_CTRL=0x%x\n", config); + + msm_dp_write_link(ctrl, REG_DP_CONFIGURATION_CTRL, config); +} + +static void msm_dp_ctrl_config_ctrl_link(struct msm_dp_ctrl_private *ctrl) +{ + u32 config = 0; const u8 *dpcd = ctrl->panel->dpcd; /* Default-> LSCLK DIV: 1/4 LCLK */ config |= (2 << DP_CONFIGURATION_CTRL_LSCLK_DIV_SHIFT); - if (ctrl->panel->msm_dp_mode.out_fmt_is_yuv_420) - config |= DP_CONFIGURATION_CTRL_RGB_YUV; /* YUV420 */ - /* Scrambler reset enable */ if (drm_dp_alternate_scrambler_reset_cap(dpcd)) config |= DP_CONFIGURATION_CTRL_ASSR; - tbd = msm_dp_link_get_test_bits_depth(ctrl->link, - ctrl->panel->msm_dp_mode.bpp); - - config |= tbd << DP_CONFIGURATION_CTRL_BPC_SHIFT; - /* Num of Lanes */ config |= ((ctrl->link->link_params.num_lanes - 1) << DP_CONFIGURATION_CTRL_NUM_OF_LANES_SHIFT); @@ -421,10 +436,7 @@ static void msm_dp_ctrl_config_ctrl(struct msm_dp_ctrl_private *ctrl) config |= DP_CONFIGURATION_CTRL_STATIC_DYNAMIC_CN; config |= DP_CONFIGURATION_CTRL_SYNC_ASYNC_CLK; - if (ctrl->panel->psr_cap.version) - config |= DP_CONFIGURATION_CTRL_SEND_VSC; - - drm_dbg_dp(ctrl->drm_dev, "DP_CONFIGURATION_CTRL=0x%x\n", config); + drm_dbg_dp(ctrl->drm_dev, "link DP_CONFIGURATION_CTRL=0x%x\n", config); msm_dp_write_link(ctrl, REG_DP_CONFIGURATION_CTRL, config); } @@ -450,7 +462,8 @@ static void msm_dp_ctrl_configure_source_params(struct msm_dp_ctrl_private *ctrl msm_dp_ctrl_lane_mapping(ctrl); msm_dp_setup_peripheral_flush(ctrl); - msm_dp_ctrl_config_ctrl(ctrl); + msm_dp_ctrl_config_ctrl_link(ctrl); + msm_dp_ctrl_config_ctrl_streams(ctrl, ctrl->panel); test_bits_depth = msm_dp_link_get_test_bits_depth(ctrl->link, ctrl->panel->msm_dp_mode.bpp); colorimetry_cfg = msm_dp_link_get_colorimetry_config(ctrl->link); @@ -1628,7 +1641,7 @@ static int msm_dp_ctrl_link_train(struct msm_dp_ctrl_private *ctrl, u8 assr; struct msm_dp_link_info link_info = {0}; - msm_dp_ctrl_config_ctrl(ctrl); + msm_dp_ctrl_config_ctrl_link(ctrl); link_info.num_lanes = ctrl->link->link_params.num_lanes; link_info.rate = ctrl->link->link_params.rate; -- 2.43.0