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 672FD3B52E0 for ; Fri, 10 Apr 2026 09:37:04 +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=1775813825; cv=none; b=Jd2wa9C9lVIrqR3DhRcILmani0YACIAth4MnkLaJ8QcbY+zsK0qhVamsZHFXSUX6vcqbAx01FmiYpXloH0qoKnvlEDE56tI4n+en59VHhWuhpEoh+QniCzqVkLyXmsoolsxGD4JuMxcg+8PbjzI2+OXCazeRpuGa3UjVF8CPlHQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775813825; c=relaxed/simple; bh=KuOg6zA+KjDAl5r8ysYKfOvdzBihYfC530yXzHv+oiw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BR1zh1n7O/kp7sE9xYKjpQ3+5SHd16sEcEV1gekX02Tvs3ZGAceggqoZmOAKHz/np3topQfusw5afD405hGvJSx+y+9PTGp+gqz9E+BQtiOJMSgMbHbyV2BLRqieeBrW6Zaoliamu2s4hUanbG0z4z6tqNys5n/amHEC3m2FJNo= 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=lZ0coo/7; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=jUDkbp0K; 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="lZ0coo/7"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="jUDkbp0K" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 63A6l2tf1432467 for ; Fri, 10 Apr 2026 09:37:03 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= jwyaSLx7WP6VcW777K/h8YgHTkkKgb1+SwGqHORpopQ=; b=lZ0coo/7TB/Kc36/ 6gLEA193+NrnUEVKZLtK80SeQxtk8+jYixo74sUSKKOa9q7j90NLxWewkD+oEI9A hiM0ah2txLoo7OVZMpS1p4jhkeKifYgJ1051ntXUZbOPhkBLtmy2MEAUno1CZjd1 s9MCIMKGscLnSoj163PHKunAup3a4F6n1x/FfY65Vie9u7AW4FVzU2ZShsO/oqTn IsUVwCI4UnJ4scHM2k9jf3n1nK0q94XieI195BAhS+knTyvZVxk8lt1EERC4rs9E B7C9SXVc9LecpJ2iUy2wNuSINR5EtRftGukLSoK5H2SAwIxseb7vC9b87m6oKts3 0c9Nvw== 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 4deckfbpd4-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 10 Apr 2026 09:37:03 +0000 (GMT) Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-8a0b5478a12so41929276d6.0 for ; Fri, 10 Apr 2026 02:37:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1775813823; x=1776418623; 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=jwyaSLx7WP6VcW777K/h8YgHTkkKgb1+SwGqHORpopQ=; b=jUDkbp0KiOtjHB3jwRrS20enxTe8ehPy5FgsZtbIgiyOehKpEojESV8692kKEV6RU7 VCF/vzbLRAKwSGLD6qUcBUFwNw2GJxIK8oZaID6/8Fo8Ji37isBewospDSbrNDEaUL5Q +j0T2xEKIAfiqoHLHbOIc8bOpCCLKxUJ2dWLL66llj9GMHvZO4P6j8WV/NWS5xNg0UNO fpre1p7jZ15cAQWBCZBE5bnKeTKuc3Q5YfX4TNodgQWp8g+d6vQCWUvmWJpNK42gfPXX JVcAxvQllwXM6jF7tduyR0Oo7b/dtB1wSufwL5FPOe7G4XQ77dpxg7D4VLu9EZHcZ+Mr mQkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775813823; x=1776418623; 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=jwyaSLx7WP6VcW777K/h8YgHTkkKgb1+SwGqHORpopQ=; b=Bcjd6gRgWTnYooE5ld5c8CLnyLg+50qhHTnInjRYh22DFyz3M1/L7EhgbUL2M+1cUN nGmxb2A4KVMuJtl8z2eKjzTLbRj85aG3ia1eAR4eQXn7MkIWNlFs2HC5F2mOsjwaz93x zvA7xAvSOrxOBblgm5CajLrq9g3q2d2vnqIXhVqvmUTKNMdrd4btY+FC5CGdoWdbj20p KeHhxOnpg5M26rvktLGBfOj754/GAwSeECkgYLuWYQefbzaNo0Boj29LFsH/EHIF0ALj nRpEByvhq1yCfV86dBfxyDs6jzBqVs3jIFwYcjnvfV819rwyeCDDuTWXGoo11/yzGFot ObfQ== X-Forwarded-Encrypted: i=1; AJvYcCV2Hjx4dkCon6x97+FPv4RDrXx4OzKxkF/yJXr1ZxpoDDjHuJ0GBMLIyyALGYUFqNmZSmV/7yUiNpXdk/c=@vger.kernel.org X-Gm-Message-State: AOJu0YxK8xsMag39+gGj65t39NVE5l/93hcpMrn10NonDj9MkesjWrnA Ege3qLN9DyXG/V1D6VU9UCwWzqZjBuZc400/GSspblOtCdYUPMXjCEj7HVU/Q1G/78kL74KW9GZ pW2GczjbFMD5eqwBC9mcR5RVKrd5XsWx16jvp1Qxewam5Km+Eoazgc2xc8NaAc56wZ8I= X-Gm-Gg: AeBDietllWUARKCvvFIRCzgHrMblXNIoGRzeAUPyee3zRmX3FS/Jbq6qNSlWDUFLiXF u0UsJ/o8V45G8TEVGdWBoTlL3buXLHygrSL277lXObDpS1FS9LKS5PCj87aH/nqa1Ikn32T58xx XfC5Sy6U/1nAULQZjsjrUO5cTkKsIVnxqeDtS6zKPoX5wXeyzy6Balw+iea4KqFuleXd2gypH1t 1CseWyYzCtxOW6v66q64UOWxXkd9q0wfgGIkVX+p27RgErYFNRjC3xDgE2RlzH0SlO/hj481T6d VVynGVEuk4OI6mXBCIghgJofPVkD4oblP8TNvvLJqOkAwr4jmcEOsc0lapyiamcJz1Ws79dktyd iVU8YivUmI6CkaRjgentqytraGgx+66ocA+U8cema2aZNQCfO1vTQD9GpZKbX8vD7yaab3ymnb+ t+X873Kd4= X-Received: by 2002:a05:6214:8084:b0:8a6:ee21:6587 with SMTP id 6a1803df08f44-8ac860e5cb9mr27226356d6.6.1775813822789; Fri, 10 Apr 2026 02:37:02 -0700 (PDT) X-Received: by 2002:a05:6214:8084:b0:8a6:ee21:6587 with SMTP id 6a1803df08f44-8ac860e5cb9mr27226056d6.6.1775813822357; Fri, 10 Apr 2026 02:37:02 -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.36.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Apr 2026 02:37:01 -0700 (PDT) From: Yongxing Mou Date: Fri, 10 Apr 2026 17:34:13 +0800 Subject: [PATCH v4 38/39] drm/msm/dpu: use msm_dp_get_mst_intf_id() to get the intf id 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-38-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 , Abhinav Kumar X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1775813628; l=4727; i=yongxing.mou@oss.qualcomm.com; s=20250910; h=from:subject:message-id; bh=tf8lOCOzq7v76ffznqEiuDk7GrrHfQZgwu4BFyIs6Ho=; b=ORQMWvfYqemO7djs1PTxP/rpq2HrJezodh3ZExIRRm3tOzK4xnbPEZB/jepGNbycSBJ65al0F PowfyISEfEQDE4aN/faWpR8kD34qe+ZaRf1987i8Dz5GtLLsIEsMRJP X-Developer-Key: i=yongxing.mou@oss.qualcomm.com; a=ed25519; pk=rAy5J1eP+V7OXqH5FJ7ngMCtUrnHhut30ZTldOj52UM= X-Authority-Analysis: v=2.4 cv=S/fpBosP c=1 sm=1 tr=0 ts=69d8c4bf 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=rJkE3RaqiGZ5pbrm-msn:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=xL80pz1hMqKSlDDrj7YA:9 a=QEXdDO2ut3YA:10 a=pJ04lnu7RYOZP9TFuWaZ:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDEwMDA4OSBTYWx0ZWRfX8cfjS16zohpd W9rgKSpsdWEWKFtBUUK38yS692MCIFKQ2gwHexeqGcQuBuCETyuVgGqUNb0sa1ByKoIkKnt8pwJ N6rYDzqdOmZN005Hfn5EjdwDS9jKW7cxbLIAMdYsKwoEDO4cEYGkzAUhnR35WN/Ax+FHkeZ8haM eJSvFjAu8jiW4OxfWMHOgv69SSBDverhd5kDC3ctDAgtlIcOekhtiOWBQDYK6EbiaDKl5UFohTT x/ooo0PTib0sfBgbMw/l67fYuVclIsBRdvD39wP8gPaQugAm5Sj5241Eti71cx9skD9hjZ6Jk9L cnto5P08bEgHy1AKMwCV+xnnCkesQ3bWta+TJH2f71m9Qzof3eXu9ukCi+bJGpiqfeRt5QHPwSa 0bzwqujAHQiVpmFQX9b9aAVwo240c8Bx1+t3VRv9IvU8Am6y6MskMz8UjiMip+Uf3+g+56vcXgK NWZh6rQaELGKxZf+2KA== X-Proofpoint-ORIG-GUID: Rpt3njCkU1qvTrVWKBegwKnHMBe5lLA8 X-Proofpoint-GUID: Rpt3njCkU1qvTrVWKBegwKnHMBe5lLA8 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 clxscore=1015 malwarescore=0 adultscore=0 spamscore=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 bulkscore=0 phishscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604010000 definitions=main-2604100089 From: Abhinav Kumar Use msm_dp_get_mst_intf_id() to get the interface ID for the DP MST controller as the intf_id is unique for each MST stream of each DP controller. For DSI/eDP/DP SST, the stream_id is always 0, so existing behavior remains unchanged. Signed-off-by: Abhinav Kumar Signed-off-by: Yongxing Mou --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 20 +++++++++++--------- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 2 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 4 ++++ 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index eba1d52211f6..d6813107a27d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -1438,18 +1438,21 @@ static void dpu_encoder_virt_atomic_disable(struct drm_encoder *drm_enc, static struct dpu_hw_intf *dpu_encoder_get_intf(const struct dpu_mdss_cfg *catalog, struct dpu_rm *dpu_rm, - enum dpu_intf_type type, u32 controller_id) + struct msm_display_info *disp_info, u32 controller_id) { - int i = 0; + int i = 0, cnt = 0; + int stream_id = disp_info->stream_id; - if (type == INTF_WB) + if (disp_info->intf_type == INTF_WB) return NULL; + DPU_DEBUG("intf_type 0x%x controller_id %d stream_id %d\n", + disp_info->intf_type, controller_id, stream_id); for (i = 0; i < catalog->intf_count; i++) { - if (catalog->intf[i].type == type - && catalog->intf[i].controller_id == controller_id) { - return dpu_rm_get_intf(dpu_rm, catalog->intf[i].id); - } + if (catalog->intf[i].type == disp_info->intf_type && + controller_id == catalog->intf[i].controller_id) + if (cnt++ == stream_id) + return dpu_rm_get_intf(dpu_rm, catalog->intf[i].id); } return NULL; @@ -2675,8 +2678,7 @@ static int dpu_encoder_setup_display(struct dpu_encoder_virt *dpu_enc, i, controller_id, phys_params.split_role); phys_params.hw_intf = dpu_encoder_get_intf(dpu_kms->catalog, &dpu_kms->rm, - disp_info->intf_type, - controller_id); + disp_info, controller_id); if (disp_info->intf_type == INTF_WB && controller_id < WB_MAX) phys_params.hw_wb = dpu_rm_get_wb(&dpu_kms->rm, controller_id); diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h index ca1ca2e51d7e..2eb4c39b111c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h @@ -28,6 +28,7 @@ * @h_tile_instance: Controller instance used per tile. Number of elements is * based on num_of_h_tiles * @is_cmd_mode Boolean to indicate if the CMD mode is requested + * @stream_id stream id for which the interface needs to be acquired * @vsync_source: Source of the TE signal for DSI CMD devices */ struct msm_display_info { @@ -35,6 +36,7 @@ struct msm_display_info { uint32_t num_of_h_tiles; uint32_t h_tile_instance[MAX_H_TILES_PER_DISPLAY]; bool is_cmd_mode; + int stream_id; enum dpu_vsync_source vsync_source; }; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index 89868443c0fe..305d4c76098d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -612,6 +612,7 @@ static int _dpu_kms_initialize_dsi(struct drm_device *dev, info.h_tile_instance[info.num_of_h_tiles++] = other; info.is_cmd_mode = msm_dsi_is_cmd_mode(priv->kms->dsi[i]); + info.stream_id = 0; rc = dpu_kms_dsi_set_te_source(&info, priv->kms->dsi[i]); if (rc) { @@ -687,6 +688,7 @@ static int _dpu_kms_initialize_displayport(struct drm_device *dev, } for (stream_id = 0; stream_id < stream_cnt; stream_id++) { + info.stream_id = 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"); @@ -720,6 +722,7 @@ static int _dpu_kms_initialize_hdmi(struct drm_device *dev, info.num_of_h_tiles = 1; info.h_tile_instance[0] = 0; info.intf_type = INTF_HDMI; + info.stream_id = 0; encoder = dpu_encoder_init(dev, DRM_MODE_ENCODER_TMDS, &info); if (IS_ERR(encoder)) { @@ -752,6 +755,7 @@ static int _dpu_kms_initialize_writeback(struct drm_device *dev, /* use only WB idx 2 instance for DPU */ info.h_tile_instance[0] = wb_idx; info.intf_type = INTF_WB; + info.stream_id = 0; maxlinewidth = dpu_rm_get_wb(&dpu_kms->rm, info.h_tile_instance[0])->caps->maxlinewidth; -- 2.43.0