From nobody Thu Apr 16 12:26:26 2026 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 7F7D738F23B for ; Fri, 27 Feb 2026 18:36:52 +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=1772217413; cv=none; b=VhbDJba/d9juRUvImHk9JkAYTmYAtrejFQZ7Yop/19DSbMZA5HdtrqJ2BZA6SqP5AoFyvnOTLOVmfjcoV8hnUXUUCeGOGS31To3Ke0s6f2D8/iHN1tnhnVWiUNj+ahIUB7vHXfp0ikTeexW76ZRGbKGC65ttdcCeXxZdK7EZFTw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772217413; c=relaxed/simple; bh=MnKwn4c8r7VoVfNPJZe9fCXyDmkqEkobHa7wzCeEoMg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=X+tMK70eTqfr1iwc0tXivuFnWJgRO9FzpLawWdxbsl6OH7dm0CSoubSRKzAtvpmYlLJyytxclr+jhlgN9wzkYgChPS7GppQMxncfQwQbXLHeJVlpa2tNBG6Ce5cgrIE76vyeE+yP39nBCjT4dqgVVpktbZBoGpoLStkXljq3xhY= 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=glUMHt0k; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Bjx0P/0R; 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="glUMHt0k"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Bjx0P/0R" 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 61RH0HBJ1365600 for ; Fri, 27 Feb 2026 18:36:51 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= KGJMLgt7ilTd+P7ELHPD6A2rgqs3i38pd9WfoMUHTow=; b=glUMHt0kD+/cBU0j L6M5kNoBLeNadKa1sU+oFK9gHlfuwXbbVzD3A3do0gNWCCz7DhFzsWnB9QhV7C2x 10AfS96BASSuk3CWVeNPB1G4N13hcc1wdbS/ENelNtpbFTB4S56EnY9a+dN6sXRa 7KBmj9s3j4YEr5tbetahfTvbiZyLBu8uhHwh/M3lIt8Q2Mf99/6WaZ/nG7dFb7HC rskZ6/vLgqPI0wWMQ2v5gQ91gMJ8blqVB8yvbG4O19q95PqDgElTQJMQKZ4NIRrg 3r66su0ZRx6nrdPhtsZf0HyvtPZgJfb79u/mDwQmh0ILvLjxotX9Qqdey7AaX1lB kULUpQ== 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 4ck9f01j35-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 27 Feb 2026 18:36:51 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-8cb0595def4so2302106985a.0 for ; Fri, 27 Feb 2026 10:36:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1772217411; x=1772822211; 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=KGJMLgt7ilTd+P7ELHPD6A2rgqs3i38pd9WfoMUHTow=; b=Bjx0P/0RWBiNNMX/oCsYLHT8u8Cvt0fhJIFeznGTntr5myw/tYiAXjE0fZaIuhS1zp AjLAsAHvRbDRJPNitRQ2T+SwCy1HRMgN1jKgaoEOd1brJ6BvswBxWbBsSF4s+CLIMbSW e9bno+X0klqHu+viRcKKFK3dChLtl0Zfgb0mDt8vBq63J12MGJXK+KLImkUm0XfzlINO 5M3w/5EgIvsNMBg5POT/h7aUNTYrDGPjW5QJY+4ne+vu/hlKbKIQWa6mMNxt4Kn7iZMQ IyDKWBvDdepx9tAr7TLW6KpVWEWUidcwnkIyzMPkDOdBtUFq/JkoUI+FgHfqMfqZYdSJ 0z9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772217411; x=1772822211; 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=KGJMLgt7ilTd+P7ELHPD6A2rgqs3i38pd9WfoMUHTow=; b=WaWy8GV4zhKV9WYuTIiwxfDNedNXS0N0LWYDgCyUrYkFrMxdiN3LW4zcHCAIU9A6hJ X5F6exHhQwxH1yDkbzEYPKhn1KKEZEJ1F7d7OAsRZJGEjBZyn9MEqNpTFmg+v4BSiiWq yA1mHSTjQ0XRSBsaooYxVNaWgHCGSwwrwG7BO1kTfTLDZ6FzTxTtlSeaAKfPqClto8bZ Y9DpOMNBedpvdo/0dAig/h9GHpyreKg6iwKrEv7L2G+5uj3go6jmxbJjS1B4rE6l9BDO TrcAukcN2X30Qc0uyiUvtPJjHr8f2xp7DmU6rgFWVJDePxjXeaFymHtkxpvmAoLh6Xg5 2rdw== X-Forwarded-Encrypted: i=1; AJvYcCX8hBjexwiHp4YItxd6dG9S6Umko6OlTU4nT37KQegevH5nx7ou13oqsaE7ewMX5nj2ei3/xRKP7sJRyd0=@vger.kernel.org X-Gm-Message-State: AOJu0YyNWwZFwn5gAsIeqkQrmP1mBGCDEdMq73PH6kMNvSXiRrSuJFEa L5grqvLmc++LBCdAUgFTEFMN4ifoVddDWOWjvxpoapy893YnKs3olmszZ2bbnb4OuGDNS2pRvGL OWbESiQVZgMdJ3pCeEdnQ0rPmyC8Dj9nVvLuBkeNKQufGB8Q/O8RID5tR5uRMA1lShv0= X-Gm-Gg: ATEYQzycTXZwJUwzdmWAy0FplGNboOF+tpv+Bl7riNCUgAWStb6ZL5NR0kj3nRIr0qk hoN63GyPB5oGjZl8cep8UjygghNBc2+w73Nsq6+aZbzDj1GHrACAAVfAqaBHzsmN/5pXNEZblFT HUoUcywZrw+/zv/RdXNbnN2OYNgYioBpZVClMMaQNY/Hcp5nwlNsJg9BztX/KORzNuIAeKOnmkY I7u6QMEMsNd1gFYMLEtdZzW05wWShlK38f3YPNPe0paagrEMcm5uqFCvzI2K+PwOco5drqeEppP xeNzskgKNTkJkzi8c/d7klI671yOFPSuRkNb3KDe/ygf0myvRyCEA4hQc1mW9bnzoyErWpMV8Mz uny/F+FoxsWeymysXwjVIwBLqO5KtE/kg+xrYwgCla0ZHH8Q3KwfmVw+lnBvPd5J3J4O7X8QvUF xPE0mkRpJKDneBlw5WLaVmLK5XIX0kzYHUj88= X-Received: by 2002:a05:620a:25cc:b0:8c7:79d:f91b with SMTP id af79cd13be357-8cbbf3527d4mr897662885a.6.1772217410540; Fri, 27 Feb 2026 10:36:50 -0800 (PST) X-Received: by 2002:a05:620a:25cc:b0:8c7:79d:f91b with SMTP id af79cd13be357-8cbbf3527d4mr897659485a.6.1772217410096; Fri, 27 Feb 2026 10:36:50 -0800 (PST) Received: from umbar.lan (2001-14ba-a073-af00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a073:af00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5a115bca0e6sm117082e87.29.2026.02.27.10.36.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Feb 2026 10:36:49 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 27 Feb 2026 20:36:40 +0200 Subject: [PATCH 1/7] drm/msm/dpu: drop VBIF_NRT handling 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: quoted-printable Message-Id: <20260227-drop-vbif-nrt-v1-1-2b97d0438182@oss.qualcomm.com> References: <20260227-drop-vbif-nrt-v1-0-2b97d0438182@oss.qualcomm.com> In-Reply-To: <20260227-drop-vbif-nrt-v1-0-2b97d0438182@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2654; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=MnKwn4c8r7VoVfNPJZe9fCXyDmkqEkobHa7wzCeEoMg=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpoeQ9O8t/pet96OPdRmkeW2M1nsgKUF8BZQaIy 7wH4sk3MeiJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaaHkPQAKCRCLPIo+Aiko 1WVNB/wPuWJbRQaFjbKoUYgouaJh+77RW6B49NPjzsfRGMyMwuGGomiKiB7jhO6ELJXNmodaC7c 0shroZMSYTNwuRfQPqaZJ2ZG4zwx9cA4NgmsubFMiOdnBNiOVggi2aGuBzBmf5XmFSX9RWF4/I4 CblybVJzv+5+4IGY3xWyuYZ7DVwMbRk8pc3mIAUT+3l2EFX57tFP38leFWrBCeTjie5+Awnv115 bwwtxYRM3XWzqxSDSEM7sFgRR6MGgbhEYRCB2U9X8REYd8ybMcMPVmtvJ8+2ZgrrWAn20IluM1+ 6UkxVg7osSYPXdvCYg9lI6VEt1lIiKdWO9plBYoq7/wN3c6+ X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMjI3MDE2NCBTYWx0ZWRfXztvWPi9R7tMH zQRQik7hSdS77CKRDF7tTaB19d2sjyJug/+7fVGNKjrcho/u+WHfnImaML2hH+3Qev6rTP1rxP1 3kP8fRrh4KhZXnu/9LCyMw4B1+LwoRFH+QE/7IwrCJa8rFxUPrV4qRYUO0cZBFchQWWRoeMMbn4 EpBriBX+Sp9WztZ7zbBehYloVupfEarOB2neweszhdgrb+19OVmaM0Idbaa1xQlpeyMB4LQeT8n bFiQMGhyy2HNYXbht7OneIFicgMzdLy2Pyb09L4YZ1eFIZZPs0WPhNUe5IvfuSDkzWdVhD4QAly OTM6zJQtf1Vt4R9cBlZh1ty4XW2LEx1twj4DtdliIsl6TF6VFENDsG8lrWjviDs6YZFVxTPGbyg 42teV63ULC3XQM0NbIeUT8utI5bfp130AcYOMhTqm1exyxNtoL/sn7ngSNJptuxAiuDyZlxz6cO //9axrHqnExDVbWetYQ== X-Proofpoint-GUID: oyYkrgFfXdHx6Qsa62DnIf1-BNESxFlv X-Authority-Analysis: v=2.4 cv=bIsb4f+Z c=1 sm=1 tr=0 ts=69a1e443 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=HzLeVaNsDn8A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=EUspDBNiAAAA:8 a=ygBLsu7f3sOcc8VWtk4A:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-ORIG-GUID: oyYkrgFfXdHx6Qsa62DnIf1-BNESxFlv X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-02-27_03,2026-02-27_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 spamscore=0 phishscore=0 impostorscore=0 suspectscore=0 malwarescore=0 bulkscore=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2602270164 The second VBIF instance, VBIF_NRT, is only used for the separate inline rotator block. It is unsupported by the DPU driver and will require a separate driver (or separate instance of the DPU device). The only possible user of VBIF_NRT is writeback on MSM8996, however writeback on that platform is currently unsupported and it's not worth keeping extra complexity for the sake of that single legacy platform. None of the hardware catalogs entries actually declare VBIF_NRT, so it is left in its default state. Stop pretending that DPU driver cares about VBIF_NRT and drop it. Reported-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov Reviewed-by: Konrad Dybcio --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 14 -------------- drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 2 -- 3 files changed, 17 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h b/drivers/gpu/drm/= msm/disp/dpu1/dpu_hw_mdss.h index 046b683d4c66..f3cb827034cc 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h @@ -286,7 +286,6 @@ enum dpu_wd_timer { =20 enum dpu_vbif { VBIF_RT, - VBIF_NRT, VBIF_MAX, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/= disp/dpu1/dpu_kms.c index 61d7e65469b3..16f129625795 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -1357,14 +1357,6 @@ static int dpu_kms_mmap_mdp5(struct dpu_kms *dpu_kms) return ret; } =20 - dpu_kms->vbif[VBIF_NRT] =3D msm_ioremap_mdss(mdss_dev, - dpu_kms->pdev, - "vbif_nrt_phys"); - if (IS_ERR(dpu_kms->vbif[VBIF_NRT])) { - dpu_kms->vbif[VBIF_NRT] =3D NULL; - DPU_DEBUG("VBIF NRT is not defined"); - } - return 0; } =20 @@ -1390,12 +1382,6 @@ static int dpu_kms_mmap_dpu(struct dpu_kms *dpu_kms) return ret; } =20 - dpu_kms->vbif[VBIF_NRT] =3D msm_ioremap_quiet(pdev, "vbif_nrt"); - if (IS_ERR(dpu_kms->vbif[VBIF_NRT])) { - dpu_kms->vbif[VBIF_NRT] =3D NULL; - DPU_DEBUG("VBIF NRT is not defined"); - } - return 0; } =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c b/drivers/gpu/drm/msm= /disp/dpu1/dpu_vbif.c index 2a551e455aa3..ede38b3c6f8c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c @@ -24,8 +24,6 @@ static const char *dpu_vbif_name(enum dpu_vbif idx) switch (idx) { case VBIF_RT: return "VBIF_RT"; - case VBIF_NRT: - return "VBIF_NRT"; default: return "??"; } --=20 2.47.3 From nobody Thu Apr 16 12:26:26 2026 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 EDEE837F74F for ; Fri, 27 Feb 2026 18:36:54 +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=1772217417; cv=none; b=YWPu4HDEz/+z5Kf3GUEoBq4FpVyf05yvc35VnOmHqMx3510Nv4qJG5hPLjanm4hgelYuVV0KIJzQt1hFXWUHulG+f6j91yVKHAccedJANulbdeXD3nrliRzHJZXKuNle55qBdOm7ucwXqzr8LNC9PWy/zfYGbU4H36Bf8wXLqI4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772217417; c=relaxed/simple; bh=wQ7wIiIog9u31W8U6g8ofBQYQu9GmNb85/2ekUBbtwQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VdkpMcDpXDXwX1VBiEo0a5BEKheufVF/QRaiWsddXj/l/YQlLUaF4A18WI7YFsce1LgkwM8hzPGxuhi6CWIkEBUWEvbt8W6hMMOqszddDoonUQaRdGNIuCmOCtUJ+1pZHPnAYsrUx+3UEzp0aBp6k2uNr0jovELfR8wAOZt6ZcU= 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=eeN9uALc; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=gFdHQgrc; 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="eeN9uALc"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="gFdHQgrc" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 61RH0Mbc065418 for ; Fri, 27 Feb 2026 18:36:54 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= knDk3tSfaQ9703dYF25NunPoznlI9mTd0Ra/y2ypvOY=; b=eeN9uALcBmTepnSW XtUAha2NjmL1Hj9/TSsa6l0SuxBx36FBctqvSl+0ilQmU4SmiIDku+J0UGEVE++O KtFWRbMVujeI6VQK0mVQvKwOlAMBWC90HcDB8wWVO2fq2f1NI1+9PfmcNAlzafj6 AkOo3hoVBHJufelyl7espbTZBA3OzaztpeFSYhCEmZ38Lmwpa1zjqHMe3Vu0USkP DX4cL+a3EEP3C1SHpXmwjoRQ7BesSwhGq62Tm04DjmlcEyhKwTE9YueZ/Dq6MFxC g0tWj9cJolp1rBUvHGBElq5jp+2xWHnExtq5G4vWVRs4o4pHrvUJS63jZL89XYOX X8xgkQ== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cka2xhd4y-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 27 Feb 2026 18:36:53 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-8cb3ad1b81aso2762272085a.2 for ; Fri, 27 Feb 2026 10:36:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1772217413; x=1772822213; 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=knDk3tSfaQ9703dYF25NunPoznlI9mTd0Ra/y2ypvOY=; b=gFdHQgrcxgBAzSwk6ZGYfgDNei7nkn7AevrDbcDhuij1GgXcigx+PQfEbdNxgSEnGg FTLMvutH9JOvHStP4SZBkWS9gPHU/o6FiPTYD/LjMY3ZQsuod7kiJhoPAIrelEV0Nx2m XOZNOhUcuPBqLmv2TjbVvWNw28O/mROa5vOZnyD6IOYyxGnratyEPGIhOlm1DJm9AarM Fm23zsYnzxlNYVvKfcwaNTDZ3fNpLs6efqUaACqeuj64ugChhLMna8+9wKa5VJyfZbzf 9LiBbHvynDx2h2kOdxk6bDTK9r9CNzcIcpFHIQcIqfV3DCjBCFnHmY5ic011jqI5elW7 CVhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772217413; x=1772822213; 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=knDk3tSfaQ9703dYF25NunPoznlI9mTd0Ra/y2ypvOY=; b=MwZ6WLpDj6/yxDYNij0ZpcndzWN+GYOI2bdyT7wzz5jFt8TzPQ0Gd9w71qKZNN60M9 fa+AC7uNxGo1r/ldBPco/qQll6TIhJW9kYrGaDcfq5zTkXuIEXJfGb6G+a0vFAhi75QT AY1cU0bQl/qf5zZ+tpPXoWaxJfPFjqZ+E2jZmcAWixpd9rQ+78oE10AA3cOU7zPfRxoy H1SeAyvII0XhDPMb25ooVNbvbAS/yyth+9y7WaGAf+cwmtQGgDhsG25qETQbe1Cr9K1a LVbO5jAsSQgY8z/twJ8WROT6O62r0FUN7D6e5/hQk//gvIHQA5/qpCYIho6EjnO/xTBZ Vdug== X-Forwarded-Encrypted: i=1; AJvYcCWmLLzZBBVAuJ790ob0p6LoiRiKvh9dEjH/Te5yOJJo+iwsyAZGCj4HG0VNRgA2E1fIbKWd+krfIpRveQI=@vger.kernel.org X-Gm-Message-State: AOJu0YwRwF+MgpcOnCHCUZ1eoGEFyWfOH/AjHMhzhTOicjiLh6/TkpfX gFCHyZDwTz8+O271AMBVqT6yQs+9DeSqzhtUnKnPXdUVDxJAegRkJB81Cf6/Zw+npNTVeEZD2Pq rXVnBLiweanuZKSocQApB9wxCNk93zSSey/erlfN+5gs+rcJ8cTSr5rRtwGuHOmdekrM= X-Gm-Gg: ATEYQzwfJ93w5d9e2AVa0A5/rdVVlPHK/gVyLFRhSpoDvinfEJrr3EG68QeycXz1Ol6 3MFBW6XqoxG8fsyGKgN41x1fOrc6qWQ+NmbXjNUXz0niirpD1+T/lL5LKPVIzdbhG7JBzGhE8ks FxRuI1Mc46mKfn/Z8BU8o8wQZF+x8bbIpUTm8h2WSWfXl4aZWcJkrONWj6iWU5ifssGTsKkOtuT N2CCI/ucT32Z4rj3WqAheN5C5za2WS8IgPxK5zLXoVnmHoY93mUTXFZyE4isC9PFXNZFMYMGDIb 7bwzFuMW7+rK5HWRyuaugG5XF06ygiSK7TAwLaw+XrueNsC9iwYuAM0DDhxUjSPSF7ugDv59fY8 RihupeVgUstYdNE7MVrQ/PSinhvBk1kqGsKuqaHkQosd1plH/lHqzyCKkahVk9YyTg6iyY2DKZZ oNzDgEl2CkebeW8KHy9pbOdwr2HOWemg9z8dI= X-Received: by 2002:a05:620a:d82:b0:8ca:105a:f5d1 with SMTP id af79cd13be357-8cbc8dee4ecmr536803385a.30.1772217412897; Fri, 27 Feb 2026 10:36:52 -0800 (PST) X-Received: by 2002:a05:620a:d82:b0:8ca:105a:f5d1 with SMTP id af79cd13be357-8cbc8dee4ecmr536797985a.30.1772217412185; Fri, 27 Feb 2026 10:36:52 -0800 (PST) Received: from umbar.lan (2001-14ba-a073-af00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a073:af00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5a115bca0e6sm117082e87.29.2026.02.27.10.36.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Feb 2026 10:36:51 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 27 Feb 2026 20:36:41 +0200 Subject: [PATCH 2/7] drm/msm/dpu: stop declaring VBIFs as an array in catalog 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: quoted-printable Message-Id: <20260227-drop-vbif-nrt-v1-2-2b97d0438182@oss.qualcomm.com> References: <20260227-drop-vbif-nrt-v1-0-2b97d0438182@oss.qualcomm.com> In-Reply-To: <20260227-drop-vbif-nrt-v1-0-2b97d0438182@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=29707; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=wQ7wIiIog9u31W8U6g8ofBQYQu9GmNb85/2ekUBbtwQ=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpoeQ9rYn6DxtEaU28BKubT7EkR7KMB3T4k1ow/ N3kLbNRZDqJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaaHkPQAKCRCLPIo+Aiko 1YieCACpRtgzp5GGd2BV93/q0GGR1oqxp3nl3txm6BSTQSx2lA9qGmS56Q7lX7EcP/bfVcEjcwL sxjRn5PWbdo9CxcQlpXrBYs7LFJKRWIf3Xej9gDlgmOxKi8bpr8weXqKMPDqL/HKL8RfpZ71y/+ hMmg9dgx7vA+7r/bH9HWQMA0+oUt8A16Mxq72hKBdXP7DF7mLa+iWP1NZLSjz6BFclrQcCja2Rd E8hPCyhnSjBQ+1o79BAVLY+jQmWPZYx1Fm1cnPkKXQYL2Lcs3L7tePBBPbjXsf/7CJ/lu+HnDAh /x3Lmx5zn7g5JAF2BZdcOxlFyVHuC+hQSpd6qLyhxMj6q5SH X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=BOC+bVQG c=1 sm=1 tr=0 ts=69a1e445 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=HzLeVaNsDn8A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=bGC42zg7wQkgJaAE8VcA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-GUID: qWa_B-cUi5hY5uplYfW2QajrQrKUDFl1 X-Proofpoint-ORIG-GUID: qWa_B-cUi5hY5uplYfW2QajrQrKUDFl1 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMjI3MDE2NCBTYWx0ZWRfXyW2BwuzrUuwp PocFh3M3wq3Tg26Lb8EZrcYNpekgkD8Q1lRPa/F6/rA8lQXK0yV6dLPU+TYyoZIxUX98nzMeUVb rO550s5CcmwWYB7UU0VtHpzz45wlfBxqkEowKkKqPZv5sPMMGReLtVW9lvWfB7OIZ0TYf05Fakc s3k94z9J94+HKMd+8VBkMSQh7mY5Rofz5Wp7ZVmchAPXuHW+PfaBcs9BB5zZLk61dGYrdlXRX+/ 003EzhPtRA88UABihEeBH37QZSH4OIdLGtaWBXpHqzm9xDVheGnjWap/Rp27A0TtGvsDASR9FDe 7KbTIF0nNxW6MDy6xndHisIGSdtyKRz7wzPDwKrJ6W2z1Qrt4oLvZmFDLtlHcsd6BoIfd7jigmu v9B76b4V4c9vV87aaL6ir8oBx5siZ65gefIQ21VJSaxRbfmSeQY1Lo6irXc72riziLqB136wWsi XoC1Ifi8svMzIx6qtjQ== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-02-27_03,2026-02-27_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 impostorscore=0 spamscore=0 suspectscore=0 phishscore=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 adultscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2602270164 The driver handles a single VBIF instance, VBIF_RT. Stop declaring VBIFs as an array in the DPU hardware catalog. Signed-off-by: Dmitry Baryshkov Reviewed-by: Konrad Dybcio --- .../drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 3 +- .../drm/msm/disp/dpu1/catalog/dpu_12_0_sm8750.h | 3 +- .../drm/msm/disp/dpu1/catalog/dpu_12_2_glymur.h | 3 +- .../drm/msm/disp/dpu1/catalog/dpu_13_0_kaanapali.h | 3 +- .../drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h | 3 +- .../drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h | 3 +- .../drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h | 3 +- .../drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h | 3 +- .../drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 3 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h | 3 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h | 3 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 3 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h | 3 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 3 +- .../drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 3 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h | 3 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h | 3 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h | 3 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 3 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 3 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h | 3 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h | 3 +- .../drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h | 3 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h | 3 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 3 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 3 +- .../drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 3 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 3 +- .../drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h | 3 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 3 +- .../drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h | 3 +- .../drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 3 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 20 ++---- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 32 ++++----- drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 79 ++++++++++--------= ---- 36 files changed, 87 insertions(+), 141 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h index 56d3c38c8778..b31cb6f16f33 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h @@ -445,8 +445,7 @@ const struct dpu_mdss_cfg dpu_sm8650_cfg =3D { .cwb =3D sm8650_cwb, .intf_count =3D ARRAY_SIZE(sm8650_intf), .intf =3D sm8650_intf, - .vbif_count =3D ARRAY_SIZE(sm8650_vbif), - .vbif =3D sm8650_vbif, + .vbif =3D &sm8650_vbif, .perf =3D &sm8650_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_12_0_sm8750.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_12_0_sm8750.h index db8cc2d0112c..b0c38b2e38c4 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_12_0_sm8750.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_12_0_sm8750.h @@ -486,8 +486,7 @@ const struct dpu_mdss_cfg dpu_sm8750_cfg =3D { .cwb =3D sm8650_cwb, .intf_count =3D ARRAY_SIZE(sm8750_intf), .intf =3D sm8750_intf, - .vbif_count =3D ARRAY_SIZE(sm8650_vbif), - .vbif =3D sm8650_vbif, + .vbif =3D &sm8650_vbif, .perf =3D &sm8750_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_12_2_glymur.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_12_2_glymur.h index 13bb43ba67d3..f6fd79a48537 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_12_2_glymur.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_12_2_glymur.h @@ -533,8 +533,7 @@ const struct dpu_mdss_cfg dpu_glymur_cfg =3D { .cwb =3D sm8650_cwb, .intf_count =3D ARRAY_SIZE(glymur_intf), .intf =3D glymur_intf, - .vbif_count =3D ARRAY_SIZE(sm8650_vbif), - .vbif =3D sm8650_vbif, + .vbif =3D &sm8650_vbif, .perf =3D &glymur_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_13_0_kaanapali.h b/d= rivers/gpu/drm/msm/disp/dpu1/catalog/dpu_13_0_kaanapali.h index 0b20401b04cf..02d2de6073f8 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_13_0_kaanapali.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_13_0_kaanapali.h @@ -484,8 +484,7 @@ const struct dpu_mdss_cfg dpu_kaanapali_cfg =3D { .cwb =3D sm8650_cwb, .intf_count =3D ARRAY_SIZE(kaanapali_intf), .intf =3D kaanapali_intf, - .vbif_count =3D ARRAY_SIZE(sm8650_vbif), - .vbif =3D sm8650_vbif, + .vbif =3D &sm8650_vbif, .perf =3D &kaanapali_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h index 29e0eba91930..4ff7b397f808 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h @@ -197,8 +197,7 @@ const struct dpu_mdss_cfg dpu_msm8937_cfg =3D { .pingpong =3D msm8937_pp, .intf_count =3D ARRAY_SIZE(msm8937_intf), .intf =3D msm8937_intf, - .vbif_count =3D ARRAY_SIZE(msm8996_vbif), - .vbif =3D msm8996_vbif, + .vbif =3D &msm8996_vbif, .perf =3D &msm8937_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h index cb1ee4b63f9f..1518c3d39ce8 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h @@ -176,8 +176,7 @@ const struct dpu_mdss_cfg dpu_msm8917_cfg =3D { .pingpong =3D msm8917_pp, .intf_count =3D ARRAY_SIZE(msm8917_intf), .intf =3D msm8917_intf, - .vbif_count =3D ARRAY_SIZE(msm8996_vbif), - .vbif =3D msm8996_vbif, + .vbif =3D &msm8996_vbif, .perf =3D &msm8917_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h index b44d02b48418..e8aabe43c9ff 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h @@ -204,8 +204,7 @@ const struct dpu_mdss_cfg dpu_msm8953_cfg =3D { .pingpong =3D msm8953_pp, .intf_count =3D ARRAY_SIZE(msm8953_intf), .intf =3D msm8953_intf, - .vbif_count =3D ARRAY_SIZE(msm8996_vbif), - .vbif =3D msm8996_vbif, + .vbif =3D &msm8996_vbif, .perf =3D &msm8953_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h index 8af63db315b4..67910a2f6880 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h @@ -320,8 +320,7 @@ const struct dpu_mdss_cfg dpu_msm8996_cfg =3D { .dsc =3D msm8996_dsc, .intf_count =3D ARRAY_SIZE(msm8996_intf), .intf =3D msm8996_intf, - .vbif_count =3D ARRAY_SIZE(msm8996_vbif), - .vbif =3D msm8996_vbif, + .vbif =3D &msm8996_vbif, .perf =3D &msm8996_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h index b1b03d8b30fa..67c1463d3bd6 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h @@ -305,8 +305,7 @@ const struct dpu_mdss_cfg dpu_msm8998_cfg =3D { .dsc =3D msm8998_dsc, .intf_count =3D ARRAY_SIZE(msm8998_intf), .intf =3D msm8998_intf, - .vbif_count =3D ARRAY_SIZE(msm8998_vbif), - .vbif =3D msm8998_vbif, + .vbif =3D &msm8998_vbif, .perf =3D &msm8998_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h index 64df4e80ea43..84344029819f 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h @@ -269,8 +269,7 @@ const struct dpu_mdss_cfg dpu_sdm660_cfg =3D { .dsc =3D sdm660_dsc, .intf_count =3D ARRAY_SIZE(sdm660_intf), .intf =3D sdm660_intf, - .vbif_count =3D ARRAY_SIZE(msm8998_vbif), - .vbif =3D msm8998_vbif, + .vbif =3D &msm8998_vbif, .perf =3D &sdm660_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h index b409af899918..ef5777aee587 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h @@ -207,8 +207,7 @@ const struct dpu_mdss_cfg dpu_sdm630_cfg =3D { .pingpong =3D sdm630_pp, .intf_count =3D ARRAY_SIZE(sdm630_intf), .intf =3D sdm630_intf, - .vbif_count =3D ARRAY_SIZE(msm8998_vbif), - .vbif =3D msm8998_vbif, + .vbif =3D &msm8998_vbif, .perf =3D &sdm630_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h index 5cc9f55d542b..019135c9a831 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h @@ -325,8 +325,7 @@ const struct dpu_mdss_cfg dpu_sdm845_cfg =3D { .dsc =3D sdm845_dsc, .intf_count =3D ARRAY_SIZE(sdm845_intf), .intf =3D sdm845_intf, - .vbif_count =3D ARRAY_SIZE(sdm845_vbif), - .vbif =3D sdm845_vbif, + .vbif =3D &sdm845_vbif, .perf =3D &sdm845_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h index 0f5e9babdeea..54b4a83ee16e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h @@ -144,8 +144,7 @@ const struct dpu_mdss_cfg dpu_sdm670_cfg =3D { .dsc =3D sdm670_dsc, .intf_count =3D ARRAY_SIZE(sdm845_intf), .intf =3D sdm845_intf, - .vbif_count =3D ARRAY_SIZE(sdm845_vbif), - .vbif =3D sdm845_vbif, + .vbif =3D &sdm845_vbif, .perf =3D &sdm845_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h index ae1b2ed96e9f..9f43ce8bf31b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h @@ -381,8 +381,7 @@ const struct dpu_mdss_cfg dpu_sm8150_cfg =3D { .wb =3D sm8150_wb, .intf_count =3D ARRAY_SIZE(sm8150_intf), .intf =3D sm8150_intf, - .vbif_count =3D ARRAY_SIZE(sdm845_vbif), - .vbif =3D sdm845_vbif, + .vbif =3D &sdm845_vbif, .perf =3D &sm8150_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h index b572cfa7ed35..14611a344371 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h @@ -405,8 +405,7 @@ const struct dpu_mdss_cfg dpu_sc8180x_cfg =3D { .wb =3D sc8180x_wb, .intf_count =3D ARRAY_SIZE(sc8180x_intf), .intf =3D sc8180x_intf, - .vbif_count =3D ARRAY_SIZE(sdm845_vbif), - .vbif =3D sdm845_vbif, + .vbif =3D &sdm845_vbif, .perf =3D &sc8180x_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h index a56c288ac10c..7b97e3b8630e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h @@ -309,8 +309,7 @@ const struct dpu_mdss_cfg dpu_sm7150_cfg =3D { .intf =3D sm7150_intf, .wb_count =3D ARRAY_SIZE(sm7150_wb), .wb =3D sm7150_wb, - .vbif_count =3D ARRAY_SIZE(sdm845_vbif), - .vbif =3D sdm845_vbif, + .vbif =3D &sdm845_vbif, .perf =3D &sm7150_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h index 26883f6b66b3..65fbd006720d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h @@ -246,8 +246,7 @@ const struct dpu_mdss_cfg dpu_sm6150_cfg =3D { .wb =3D sm6150_wb, .intf_count =3D ARRAY_SIZE(sm6150_intf), .intf =3D sm6150_intf, - .vbif_count =3D ARRAY_SIZE(sdm845_vbif), - .vbif =3D sdm845_vbif, + .vbif =3D &sdm845_vbif, .perf =3D &sm6150_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h index fbf50f279e66..c7833ca05eb4 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h @@ -217,8 +217,7 @@ const struct dpu_mdss_cfg dpu_sm6125_cfg =3D { .wb =3D sm6125_wb, .intf_count =3D ARRAY_SIZE(sm6125_intf), .intf =3D sm6125_intf, - .vbif_count =3D ARRAY_SIZE(sdm845_vbif), - .vbif =3D sdm845_vbif, + .vbif =3D &sdm845_vbif, .perf =3D &sm6125_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h index 7b8b7a1c2d76..09ca22b93e68 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h @@ -378,8 +378,7 @@ const struct dpu_mdss_cfg dpu_sm8250_cfg =3D { .merge_3d =3D sm8250_merge_3d, .intf_count =3D ARRAY_SIZE(sm8250_intf), .intf =3D sm8250_intf, - .vbif_count =3D ARRAY_SIZE(sdm845_vbif), - .vbif =3D sdm845_vbif, + .vbif =3D &sdm845_vbif, .wb_count =3D ARRAY_SIZE(sm8250_wb), .wb =3D sm8250_wb, .perf =3D &sm8250_perf_data, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h index c990ba3b5db0..3adc3350f05b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h @@ -211,8 +211,7 @@ const struct dpu_mdss_cfg dpu_sc7180_cfg =3D { .intf =3D sc7180_intf, .wb_count =3D ARRAY_SIZE(sc7180_wb), .wb =3D sc7180_wb, - .vbif_count =3D ARRAY_SIZE(sdm845_vbif), - .vbif =3D sdm845_vbif, + .vbif =3D &sdm845_vbif, .perf =3D &sc7180_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h index 343ff5482382..20a2e9ff5cc9 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h @@ -144,8 +144,7 @@ const struct dpu_mdss_cfg dpu_sm6115_cfg =3D { .pingpong =3D sm6115_pp, .intf_count =3D ARRAY_SIZE(sm6115_intf), .intf =3D sm6115_intf, - .vbif_count =3D ARRAY_SIZE(sdm845_vbif), - .vbif =3D sdm845_vbif, + .vbif =3D &sdm845_vbif, .perf =3D &sm6115_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h index 093d16bdc450..7b58e438f597 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h @@ -229,8 +229,7 @@ const struct dpu_mdss_cfg dpu_sm6350_cfg =3D { .wb =3D sm6350_wb, .intf_count =3D ARRAY_SIZE(sm6350_intf), .intf =3D sm6350_intf, - .vbif_count =3D ARRAY_SIZE(sdm845_vbif), - .vbif =3D sdm845_vbif, + .vbif =3D &sdm845_vbif, .perf =3D &sm6350_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h index 47053bf9b0a2..7ae7530aa3b0 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h @@ -137,8 +137,7 @@ const struct dpu_mdss_cfg dpu_qcm2290_cfg =3D { .pingpong =3D qcm2290_pp, .intf_count =3D ARRAY_SIZE(qcm2290_intf), .intf =3D qcm2290_intf, - .vbif_count =3D ARRAY_SIZE(sdm845_vbif), - .vbif =3D sdm845_vbif, + .vbif =3D &sdm845_vbif, .perf =3D &qcm2290_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h index 98190ee7ec7a..fc7ceac859be 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h @@ -155,8 +155,7 @@ const struct dpu_mdss_cfg dpu_sm6375_cfg =3D { .pingpong =3D sm6375_pp, .intf_count =3D ARRAY_SIZE(sm6375_intf), .intf =3D sm6375_intf, - .vbif_count =3D ARRAY_SIZE(sdm845_vbif), - .vbif =3D sdm845_vbif, + .vbif =3D &sdm845_vbif, .perf =3D &sm6375_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h index 85aae40c210f..a3fea0ade688 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h @@ -392,8 +392,7 @@ const struct dpu_mdss_cfg dpu_sm8350_cfg =3D { .wb =3D sm8350_wb, .intf_count =3D ARRAY_SIZE(sm8350_intf), .intf =3D sm8350_intf, - .vbif_count =3D ARRAY_SIZE(sdm845_vbif), - .vbif =3D sdm845_vbif, + .vbif =3D &sdm845_vbif, .perf =3D &sm8350_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h index 2f8688224f34..ce38e93c0d7e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h @@ -263,8 +263,7 @@ const struct dpu_mdss_cfg dpu_sc7280_cfg =3D { .wb =3D sc7280_wb, .intf_count =3D ARRAY_SIZE(sc7280_intf), .intf =3D sc7280_intf, - .vbif_count =3D ARRAY_SIZE(sdm845_vbif), - .vbif =3D sdm845_vbif, + .vbif =3D &sdm845_vbif, .perf =3D &sc7280_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h index 303d33dc7783..12993751b397 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h @@ -421,8 +421,7 @@ const struct dpu_mdss_cfg dpu_sc8280xp_cfg =3D { .merge_3d =3D sc8280xp_merge_3d, .intf_count =3D ARRAY_SIZE(sc8280xp_intf), .intf =3D sc8280xp_intf, - .vbif_count =3D ARRAY_SIZE(sdm845_vbif), - .vbif =3D sdm845_vbif, + .vbif =3D &sdm845_vbif, .perf =3D &sc8280xp_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h index b09a6af4c474..9983a297b68a 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h @@ -405,8 +405,7 @@ const struct dpu_mdss_cfg dpu_sm8450_cfg =3D { .wb =3D sm8450_wb, .intf_count =3D ARRAY_SIZE(sm8450_intf), .intf =3D sm8450_intf, - .vbif_count =3D ARRAY_SIZE(sdm845_vbif), - .vbif =3D sdm845_vbif, + .vbif =3D &sdm845_vbif, .perf =3D &sm8450_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h index 0f7b4a224e4c..cb2513785f5f 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h @@ -445,8 +445,7 @@ const struct dpu_mdss_cfg dpu_sa8775p_cfg =3D { .wb =3D sa8775p_wb, .intf_count =3D ARRAY_SIZE(sa8775p_intf), .intf =3D sa8775p_intf, - .vbif_count =3D ARRAY_SIZE(sdm845_vbif), - .vbif =3D sdm845_vbif, + .vbif =3D &sdm845_vbif, .perf =3D &sa8775p_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h index 465b6460f875..384ed6e86fc2 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h @@ -400,8 +400,7 @@ const struct dpu_mdss_cfg dpu_sm8550_cfg =3D { .wb =3D sm8550_wb, .intf_count =3D ARRAY_SIZE(sm8550_intf), .intf =3D sm8550_intf, - .vbif_count =3D ARRAY_SIZE(sm8550_vbif), - .vbif =3D sm8550_vbif, + .vbif =3D &sm8550_vbif, .perf =3D &sm8550_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h index 6caa7d40f368..6777eb75faec 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h @@ -400,8 +400,7 @@ const struct dpu_mdss_cfg dpu_sar2130p_cfg =3D { .wb =3D sar2130p_wb, .intf_count =3D ARRAY_SIZE(sar2130p_intf), .intf =3D sar2130p_intf, - .vbif_count =3D ARRAY_SIZE(sm8550_vbif), - .vbif =3D sm8550_vbif, + .vbif =3D &sm8550_vbif, .perf =3D &sar2130p_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h index 7243eebb85f3..b5e2d832666d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h @@ -441,8 +441,7 @@ const struct dpu_mdss_cfg dpu_x1e80100_cfg =3D { .wb =3D x1e80100_wb, .intf_count =3D ARRAY_SIZE(x1e80100_intf), .intf =3D x1e80100_intf, - .vbif_count =3D ARRAY_SIZE(sm8550_vbif), - .vbif =3D sm8550_vbif, + .vbif =3D &sm8550_vbif, .perf =3D &x1e80100_perf_data, }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/d= rm/msm/disp/dpu1/dpu_hw_catalog.c index c4e1f6b7345d..94c70b7b789e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -513,8 +513,7 @@ static const struct dpu_vbif_dynamic_ot_cfg msm8998_ot_= rdwr_cfg[] =3D { }, }; =20 -static const struct dpu_vbif_cfg msm8996_vbif[] =3D { - { +static const struct dpu_vbif_cfg msm8996_vbif =3D { .name =3D "vbif_rt", .id =3D VBIF_RT, .base =3D 0, .len =3D 0x1040, .default_ot_rd_limit =3D 32, @@ -538,11 +537,9 @@ static const struct dpu_vbif_cfg msm8996_vbif[] =3D { .npriority_lvl =3D ARRAY_SIZE(msm8998_nrt_pri_lvl), .priority_lvl =3D msm8998_nrt_pri_lvl, }, - }, }; =20 -static const struct dpu_vbif_cfg msm8998_vbif[] =3D { - { +static const struct dpu_vbif_cfg msm8998_vbif =3D { .name =3D "vbif_rt", .id =3D VBIF_RT, .base =3D 0, .len =3D 0x1040, .default_ot_rd_limit =3D 32, @@ -568,11 +565,9 @@ static const struct dpu_vbif_cfg msm8998_vbif[] =3D { }, .memtype_count =3D 14, .memtype =3D {2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2}, - }, }; =20 -static const struct dpu_vbif_cfg sdm845_vbif[] =3D { - { +static const struct dpu_vbif_cfg sdm845_vbif =3D { .name =3D "vbif_rt", .id =3D VBIF_RT, .base =3D 0, .len =3D 0x1040, .features =3D BIT(DPU_VBIF_QOS_REMAP), @@ -588,11 +583,9 @@ static const struct dpu_vbif_cfg sdm845_vbif[] =3D { }, .memtype_count =3D 14, .memtype =3D {3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3}, - }, }; =20 -static const struct dpu_vbif_cfg sm8550_vbif[] =3D { - { +static const struct dpu_vbif_cfg sm8550_vbif =3D { .name =3D "vbif_rt", .id =3D VBIF_RT, .base =3D 0, .len =3D 0x1040, .features =3D BIT(DPU_VBIF_QOS_REMAP), @@ -608,11 +601,9 @@ static const struct dpu_vbif_cfg sm8550_vbif[] =3D { }, .memtype_count =3D 16, .memtype =3D {3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3}, - }, }; =20 -static const struct dpu_vbif_cfg sm8650_vbif[] =3D { - { +static const struct dpu_vbif_cfg sm8650_vbif =3D { .name =3D "vbif_rt", .id =3D VBIF_RT, .base =3D 0, .len =3D 0x1074, .features =3D BIT(DPU_VBIF_QOS_REMAP), @@ -628,7 +619,6 @@ static const struct dpu_vbif_cfg sm8650_vbif[] =3D { }, .memtype_count =3D 16, .memtype =3D {3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3}, - }, }; =20 /************************************************************* diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/d= rm/msm/disp/dpu1/dpu_hw_catalog.h index 70d5ed4732f2..fda4f3bdd797 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -743,7 +743,6 @@ struct dpu_mdss_cfg { u32 intf_count; const struct dpu_intf_cfg *intf; =20 - u32 vbif_count; const struct dpu_vbif_cfg *vbif; =20 u32 wb_count; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/= disp/dpu1/dpu_kms.c index 16f129625795..5f0960368db3 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -1059,13 +1059,11 @@ static void dpu_kms_mdp_snapshot(struct msm_disp_st= ate *disp_state, struct msm_k dpu_kms->mmio + cat->cdm->base, "%s", cat->cdm->name); =20 - for (i =3D 0; i < dpu_kms->catalog->vbif_count; i++) { - const struct dpu_vbif_cfg *vbif =3D &dpu_kms->catalog->vbif[i]; + const struct dpu_vbif_cfg *vbif =3D dpu_kms->catalog->vbif; =20 - msm_disp_snapshot_add_block(disp_state, vbif->len, - dpu_kms->vbif[vbif->id] + vbif->base, - "%s", vbif->name); - } + msm_disp_snapshot_add_block(disp_state, vbif->len, + dpu_kms->vbif, + "vbif"); =20 pm_runtime_put_sync(&dpu_kms->pdev->dev); } @@ -1143,7 +1141,7 @@ static int dpu_kms_hw_init(struct msm_kms *kms) { struct dpu_kms *dpu_kms; struct drm_device *dev; - int i, rc =3D -EINVAL; + int rc =3D -EINVAL; unsigned long max_core_clk_rate; u32 core_rev; =20 @@ -1219,20 +1217,18 @@ static int dpu_kms_hw_init(struct msm_kms *kms) goto err_pm_put; } =20 - for (i =3D 0; i < dpu_kms->catalog->vbif_count; i++) { - struct dpu_hw_vbif *hw; - const struct dpu_vbif_cfg *vbif =3D &dpu_kms->catalog->vbif[i]; - - hw =3D dpu_hw_vbif_init(dev, vbif, dpu_kms->vbif[vbif->id]); - if (IS_ERR(hw)) { - rc =3D PTR_ERR(hw); - DPU_ERROR("failed to init vbif %d: %d\n", vbif->id, rc); - goto err_pm_put; - } + struct dpu_hw_vbif *hw; + const struct dpu_vbif_cfg *vbif =3D dpu_kms->catalog->vbif; =20 - dpu_kms->hw_vbif[vbif->id] =3D hw; + hw =3D dpu_hw_vbif_init(dev, vbif, dpu_kms->vbif[vbif->id]); + if (IS_ERR(hw)) { + rc =3D PTR_ERR(hw); + DPU_ERROR("failed to init vbif: %d\n", rc); + goto err_pm_put; } =20 + dpu_kms->hw_vbif[vbif->id] =3D hw; + /* TODO: use the same max_freq as in dpu_kms_hw_init */ max_core_clk_rate =3D dpu_kms_get_clk_rate(dpu_kms, "core"); if (!max_core_clk_rate) { diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c b/drivers/gpu/drm/msm= /disp/dpu1/dpu_vbif.c index ede38b3c6f8c..6ebd9627514b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c @@ -292,58 +292,51 @@ void dpu_vbif_init_memtypes(struct dpu_kms *dpu_kms) =20 void dpu_debugfs_vbif_init(struct dpu_kms *dpu_kms, struct dentry *debugfs= _root) { + const struct dpu_vbif_cfg *vbif =3D dpu_kms->catalog->vbif; char vbif_name[32]; - struct dentry *entry, *debugfs_vbif; - int i, j; - - entry =3D debugfs_create_dir("vbif", debugfs_root); - - for (i =3D 0; i < dpu_kms->catalog->vbif_count; i++) { - const struct dpu_vbif_cfg *vbif =3D &dpu_kms->catalog->vbif[i]; - - snprintf(vbif_name, sizeof(vbif_name), "%d", vbif->id); + struct dentry *debugfs_vbif; + int j; =20 - debugfs_vbif =3D debugfs_create_dir(vbif_name, entry); + debugfs_vbif =3D debugfs_create_dir("vbif", debugfs_root); =20 - debugfs_create_u32("features", 0600, debugfs_vbif, - (u32 *)&vbif->features); + debugfs_create_u32("features", 0600, debugfs_vbif, + (u32 *)&vbif->features); =20 - debugfs_create_u32("xin_halt_timeout", 0400, debugfs_vbif, - (u32 *)&vbif->xin_halt_timeout); + debugfs_create_u32("xin_halt_timeout", 0400, debugfs_vbif, + (u32 *)&vbif->xin_halt_timeout); =20 - debugfs_create_u32("default_rd_ot_limit", 0400, debugfs_vbif, - (u32 *)&vbif->default_ot_rd_limit); + debugfs_create_u32("default_rd_ot_limit", 0400, debugfs_vbif, + (u32 *)&vbif->default_ot_rd_limit); =20 - debugfs_create_u32("default_wr_ot_limit", 0400, debugfs_vbif, - (u32 *)&vbif->default_ot_wr_limit); + debugfs_create_u32("default_wr_ot_limit", 0400, debugfs_vbif, + (u32 *)&vbif->default_ot_wr_limit); =20 - for (j =3D 0; j < vbif->dynamic_ot_rd_tbl.count; j++) { - const struct dpu_vbif_dynamic_ot_cfg *cfg =3D - &vbif->dynamic_ot_rd_tbl.cfg[j]; + for (j =3D 0; j < vbif->dynamic_ot_rd_tbl.count; j++) { + const struct dpu_vbif_dynamic_ot_cfg *cfg =3D + &vbif->dynamic_ot_rd_tbl.cfg[j]; =20 - snprintf(vbif_name, sizeof(vbif_name), - "dynamic_ot_rd_%d_pps", j); - debugfs_create_u64(vbif_name, 0400, debugfs_vbif, - (u64 *)&cfg->pps); - snprintf(vbif_name, sizeof(vbif_name), - "dynamic_ot_rd_%d_ot_limit", j); - debugfs_create_u32(vbif_name, 0400, debugfs_vbif, - (u32 *)&cfg->ot_limit); - } + snprintf(vbif_name, sizeof(vbif_name), + "dynamic_ot_rd_%d_pps", j); + debugfs_create_u64(vbif_name, 0400, debugfs_vbif, + (u64 *)&cfg->pps); + snprintf(vbif_name, sizeof(vbif_name), + "dynamic_ot_rd_%d_ot_limit", j); + debugfs_create_u32(vbif_name, 0400, debugfs_vbif, + (u32 *)&cfg->ot_limit); + } =20 - for (j =3D 0; j < vbif->dynamic_ot_wr_tbl.count; j++) { - const struct dpu_vbif_dynamic_ot_cfg *cfg =3D - &vbif->dynamic_ot_wr_tbl.cfg[j]; - - snprintf(vbif_name, sizeof(vbif_name), - "dynamic_ot_wr_%d_pps", j); - debugfs_create_u64(vbif_name, 0400, debugfs_vbif, - (u64 *)&cfg->pps); - snprintf(vbif_name, sizeof(vbif_name), - "dynamic_ot_wr_%d_ot_limit", j); - debugfs_create_u32(vbif_name, 0400, debugfs_vbif, - (u32 *)&cfg->ot_limit); - } + for (j =3D 0; j < vbif->dynamic_ot_wr_tbl.count; j++) { + const struct dpu_vbif_dynamic_ot_cfg *cfg =3D + &vbif->dynamic_ot_wr_tbl.cfg[j]; + + snprintf(vbif_name, sizeof(vbif_name), + "dynamic_ot_wr_%d_pps", j); + debugfs_create_u64(vbif_name, 0400, debugfs_vbif, + (u64 *)&cfg->pps); + snprintf(vbif_name, sizeof(vbif_name), + "dynamic_ot_wr_%d_ot_limit", j); + debugfs_create_u32(vbif_name, 0400, debugfs_vbif, + (u32 *)&cfg->ot_limit); } } #endif --=20 2.47.3 From nobody Thu Apr 16 12:26:26 2026 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 3E9AA38F23B for ; Fri, 27 Feb 2026 18:36:57 +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=1772217419; cv=none; b=CHTxG7MU8G/9ni3vc55yHpYACpY9BhssWfhw8YGcFocM/3GK7NA7MG1YRct6bRGuXRJ89eRZqOeS8NZznVMr1kTQPUTVR0QWRgmWDm2RirVvleGcfEDkVqIKU/NPb9Wi9/whMNQLgxbDibtDDtJp648lA9X96gNXAggZpAs9SPk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772217419; c=relaxed/simple; bh=jtx4caMdNiI5fTAT/34EoDSgo/ae6naKuxWgagrfJEU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qG6YI5RiYvQEWe9kCO/C1JouZ4aOuJQJxmFPEUeCZ4dJuv5QRFUGYwGASIYSYnLhFat7VUAE+BdgLr5Yzi+UqPdLKieOzxB0IksFyzOP0EWtpWBGAYUpsB53Q1Jv5v7lNdJPBeBHnvMuEoFc0t5VT9hriax9bzaRJue8lqkI7A0= 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=OsV/3gYr; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=LOUdl+DI; 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="OsV/3gYr"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="LOUdl+DI" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 61RH0IA5151881 for ; Fri, 27 Feb 2026 18:36:57 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= 4IE3O8RcZ2cyQt1CqaPozoDzewVBG1KDsBmyvR+tfIo=; b=OsV/3gYrV1l14RTJ PMq1/L11GC9Cs4GYEIHiIDY2FT0nZth8fvgSwhx9jOnVnCymrK49842cRzjWBns8 Ml2pATas6s0cbD1+fmMZEEOIa0+bU9ksqv/MPCQFawM5/1RynjJ6R6IWNZgeurNU Y9HZdvgwaT4Q62oNdpKOj0DQpFJ5cu3yrTFLmjlHgj9Ry8UYBZUIyT67WBY2127R do9Kf8IKSqHyMVPakMEDtRd6g51jmEwU7tgUzGKqtyeJq9mgvAy233MNli60xjqX 5tZRITz0CS0ajXjI7dsbryBJ474VxVQE/reExep1jhnI6itQP2TW8z6uGkFw4v7H 6fzmWw== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cju4r4jyu-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 27 Feb 2026 18:36:57 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-8cb6291d95aso2472288585a.1 for ; Fri, 27 Feb 2026 10:36:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1772217416; x=1772822216; 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=4IE3O8RcZ2cyQt1CqaPozoDzewVBG1KDsBmyvR+tfIo=; b=LOUdl+DIRxZzWJVgrx0VWjxrVMAkJ4Y+mwUE5Cig/JQxpRhehtw8iN55v0hUBALCi0 ksAj+8Pd69Hb8t5ujSLhaAFXUtjxqQX9LwyQGMXmrCF7E0kLl/bQ0M6oVIK5cuyld/pd ida/KmJZsx06GCq/2D1o5JhXiufZjeKGo6hr+wEGh2LplqUP1sktAK0LRDOVUKXWTE+0 bwKOuu1xpaikZWkOK4+cxO0vbdTAdHhiR8a14fACK3sZKQwgdu5RwuyJ9tT8GuB7otGT XizB6ZvQ1IBlOoLbPsIfIaUFUEhae4UzEikpRCwnMTVxf64ctm7Qqfc1UX7Y6vBoMRH0 h6MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772217416; x=1772822216; 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=4IE3O8RcZ2cyQt1CqaPozoDzewVBG1KDsBmyvR+tfIo=; b=otKk4GvOEGRU8P6dyN9LApXmSGmbzlrHbsm9JTiUm2t8T0wdQlW5/omxE4qkl7CKyj x15zv0Qw4UW5oenzz8XLBRkx1GFmqFjC6spY3TMvj42NsQz/Au3e1XceTtu/tPJ4zo7U OjQB2HWKmiauJoq8zTLHIt/ewMED4afAnolucoevPO1LtCiDf9ONGHIR/uPdYjcDWQG6 NQ/9i0cAkj4dMTpOQKv7IJP5leeTD3JQLDLPtXTkbEQGkaXQVsLFv4MAUEG62nn3V3VF T9cPb0wTl4dU3LD8GVcAsLM8waUk3pvwyE/mc85mKEDZ0Zc5+HremjYQP4uIVX1xgb0k jVtw== X-Forwarded-Encrypted: i=1; AJvYcCURdnpuHrFqtK2fIUajg8Yz/wbLvnIDMkoC4bZSOXlk8fU5ILfBK917rsu9JN09Q5eetPUc1tNN6i5C4qA=@vger.kernel.org X-Gm-Message-State: AOJu0YxOz5M7obcB/P5RyT93fLV26ZTBQHYUVrMhIGVYwaR4BtRDAX1Y Yax+rPNZH6pCIPyxkBXBJFqoa6EXm71QPH8WpLaGhPZO8jhpLW3zODmyPDPnoqN0De3NFFXoNbm QTwvJY7ZF1GJEqCwrZJPfdQcd+YABLvE3hQKd1IIkE48nXJQhcr6VgPaUMYMezo2oGrI= X-Gm-Gg: ATEYQzxE7ly4CjLb6Nv73yp9iOAo9D0rQU93kfQ8WwHtDC72xdvJe/t/j7pJOp1dvhu HOjrnaTy4n3BdfIktSwQWsHDvbq0CtRdxHYT4d5rzz/iRq4FsGCVl/lLaD2ZR8NcSvlGbqDpLnW ScNXx8zJ7iYv6Y9htxZ3Jtn6WpSISRXdEkaLxIDJui2U0+PurtIpPGttqPIfElcAzh/EoXk5Ucm 7QQw0/gwPXEzvqA66OL6zVWuq+gIOGHDQszB9w+paexqfoo2DP8Lopljm75etRrtxXTRr4rmwRo VfeC6+gKIWUmGj2fP7ht4AR8qU2P8Wonb/H2pAhTXj0121aeFZOv09JEwUmX4AO/WodtBmZykFx QrgXrZF7WVGCQg77VmqcYoOMxG3fNB3lShxb98m1fEVxOQrlCWyxCQNvoPcczcBctfJrTxT/t/5 n/NGS+iT0FuAbaYpQz44cnj8lvL0mdh5L/F7s= X-Received: by 2002:a05:620a:171e:b0:8cb:72b2:2a03 with SMTP id af79cd13be357-8cbc8dc4137mr459910785a.4.1772217416310; Fri, 27 Feb 2026 10:36:56 -0800 (PST) X-Received: by 2002:a05:620a:171e:b0:8cb:72b2:2a03 with SMTP id af79cd13be357-8cbc8dc4137mr459907685a.4.1772217415832; Fri, 27 Feb 2026 10:36:55 -0800 (PST) Received: from umbar.lan (2001-14ba-a073-af00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a073:af00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5a115bca0e6sm117082e87.29.2026.02.27.10.36.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Feb 2026 10:36:53 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 27 Feb 2026 20:36:42 +0200 Subject: [PATCH 3/7] drm/msm/dpu: replace VBIF-related array with bare pointers 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: quoted-printable Message-Id: <20260227-drop-vbif-nrt-v1-3-2b97d0438182@oss.qualcomm.com> References: <20260227-drop-vbif-nrt-v1-0-2b97d0438182@oss.qualcomm.com> In-Reply-To: <20260227-drop-vbif-nrt-v1-0-2b97d0438182@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=6597; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=jtx4caMdNiI5fTAT/34EoDSgo/ae6naKuxWgagrfJEU=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpoeQ9jPaVwM4aQnIOKc+/if5zv2gfEuub3Q6A9 SHtG2AtIlSJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaaHkPQAKCRCLPIo+Aiko 1TmdB/4iQUwctUc7kIs57oUEj9FLfoOw4gu6LX8KYAZASl7LqPJGQ2f17dtLJalrY5/20jiXtlS oK3svF5J9MJdskMbCk6IblkycJC3gPt4CF3nJS62u2uXBkDUNvS/MG9NtDL5PInb/barPt0D8iL /8kLInLsInhKJA93/+m/6CT21NHrpG2HL1ReswAGkwtLgnecuPaEUgrys7ZCaZuA/DCQ37rqVgv Vt7VVdapdxVFF/iRPsB0W8gKk2rOCeEIX66pmq57fZGRIDSRdIhtlSYhbs/bZ8oONUQz7u66O96 iWNDUbx1yNHOS07FJdSAG/8V74/pFZzrgHVQDfdHARw9SwJr X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMjI3MDE2NCBTYWx0ZWRfX2O485YbRWnlv JR90SMOmHP7OWVJ7HyL5db8z3ZAj7Oicos9S9Tr7UR3uAgAmu7gmfgzuol3fr/bSPNaI5Z3Mt1c L9GE8PTVeAbkbhQ1dCtXdQOtij4uR0iVDb8UMpulGDzYnAEYQJWXS+oUh5hDlW7Izaq9OzJO0JO cvZpauKCwjmT/nERukJCJd3/TvntgjWwWRxSO8hGr7zusKNMXhEex6SJgeL776vLl7ikMLlKrnX DRvUOYW4vY+ezzWv0/hW4F+2dH3V21Sx3mfhyOwQoF8JoVOQa8QK7xcZr/WRoYdFmyaW0HQ5Zft LM4nNNMgE7Eovuay71lzo213NM1MODUjJDq4NduT2TE8kFE5Ghqog2EGGpnTy9xebtVg224NbwL ee5xgfaPCD6uhQWA3SAQF/AoNhhLbp6cilzqF6hYiRCwltG2h7raZXMs8qVs14tBnxsIpnjDrDV LS8+l/207TCQ9S4ehwg== X-Proofpoint-GUID: FZyTtXXGD2PQLwgPnPJhwRlW7XlOwWSO X-Authority-Analysis: v=2.4 cv=KZzfcAYD c=1 sm=1 tr=0 ts=69a1e449 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=HzLeVaNsDn8A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=EUspDBNiAAAA:8 a=ZDNR4LwpRtkDERcRuL4A:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-ORIG-GUID: FZyTtXXGD2PQLwgPnPJhwRlW7XlOwWSO X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-02-27_03,2026-02-27_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 lowpriorityscore=0 priorityscore=1501 suspectscore=0 malwarescore=0 bulkscore=0 adultscore=0 phishscore=0 spamscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2602270164 As we no longer have multiple VBIF instances, it doesn't make sense to keep VBIF data as arrays. Drop the extra wrapping and keep only a single instance of each of the structures. Signed-off-by: Dmitry Baryshkov Reviewed-by: Konrad Dybcio --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 28 +++++++----------- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 4 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 45 ++++++++++---------------= ---- 4 files changed, 29 insertions(+), 49 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h b/drivers/gpu/drm/= msm/disp/dpu1/dpu_hw_mdss.h index f3cb827034cc..a169628eb512 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h @@ -286,7 +286,6 @@ enum dpu_wd_timer { =20 enum dpu_vbif { VBIF_RT, - VBIF_MAX, }; =20 /** diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/= disp/dpu1/dpu_kms.c index 5f0960368db3..416dd4c2464d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -886,16 +886,12 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_= kms) =20 static void _dpu_kms_hw_destroy(struct dpu_kms *dpu_kms) { - int i; - dpu_kms->hw_intr =3D NULL; =20 /* safe to call these more than once during shutdown */ _dpu_kms_mmu_destroy(dpu_kms); =20 - for (i =3D 0; i < ARRAY_SIZE(dpu_kms->hw_vbif); i++) { - dpu_kms->hw_vbif[i] =3D NULL; - } + dpu_kms->hw_vbif =3D NULL; =20 dpu_kms_global_obj_fini(dpu_kms); =20 @@ -1220,14 +1216,14 @@ static int dpu_kms_hw_init(struct msm_kms *kms) struct dpu_hw_vbif *hw; const struct dpu_vbif_cfg *vbif =3D dpu_kms->catalog->vbif; =20 - hw =3D dpu_hw_vbif_init(dev, vbif, dpu_kms->vbif[vbif->id]); + hw =3D dpu_hw_vbif_init(dev, vbif, dpu_kms->vbif); if (IS_ERR(hw)) { rc =3D PTR_ERR(hw); DPU_ERROR("failed to init vbif: %d\n", rc); goto err_pm_put; } =20 - dpu_kms->hw_vbif[vbif->id] =3D hw; + dpu_kms->hw_vbif =3D hw; =20 /* TODO: use the same max_freq as in dpu_kms_hw_init */ max_core_clk_rate =3D dpu_kms_get_clk_rate(dpu_kms, "core"); @@ -1343,13 +1339,11 @@ static int dpu_kms_mmap_mdp5(struct dpu_kms *dpu_km= s) } DRM_DEBUG("mapped dpu address space @%p\n", dpu_kms->mmio); =20 - dpu_kms->vbif[VBIF_RT] =3D msm_ioremap_mdss(mdss_dev, - dpu_kms->pdev, - "vbif_phys"); - if (IS_ERR(dpu_kms->vbif[VBIF_RT])) { - ret =3D PTR_ERR(dpu_kms->vbif[VBIF_RT]); + dpu_kms->vbif =3D msm_ioremap_mdss(mdss_dev, dpu_kms->pdev, "vbif_phys"); + if (IS_ERR(dpu_kms->vbif)) { + ret =3D PTR_ERR(dpu_kms->vbif); DPU_ERROR("vbif register memory map failed: %d\n", ret); - dpu_kms->vbif[VBIF_RT] =3D NULL; + dpu_kms->vbif =3D NULL; return ret; } =20 @@ -1370,11 +1364,11 @@ static int dpu_kms_mmap_dpu(struct dpu_kms *dpu_kms) } DRM_DEBUG("mapped dpu address space @%p\n", dpu_kms->mmio); =20 - dpu_kms->vbif[VBIF_RT] =3D msm_ioremap(pdev, "vbif"); - if (IS_ERR(dpu_kms->vbif[VBIF_RT])) { - ret =3D PTR_ERR(dpu_kms->vbif[VBIF_RT]); + dpu_kms->vbif =3D msm_ioremap(pdev, "vbif"); + if (IS_ERR(dpu_kms->vbif)) { + ret =3D PTR_ERR(dpu_kms->vbif); DPU_ERROR("vbif register memory map failed: %d\n", ret); - dpu_kms->vbif[VBIF_RT] =3D NULL; + dpu_kms->vbif =3D NULL; return ret; } =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h b/drivers/gpu/drm/msm/= disp/dpu1/dpu_kms.h index 993cf512f8c5..bb3393bd102e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h @@ -63,7 +63,7 @@ struct dpu_kms { const struct qcom_ubwc_cfg_data *mdss; =20 /* io/register spaces: */ - void __iomem *mmio, *vbif[VBIF_MAX]; + void __iomem *mmio, *vbif; =20 struct regulator *vdd; struct regulator *mmagic; @@ -81,7 +81,7 @@ struct dpu_kms { =20 struct dpu_rm rm; =20 - struct dpu_hw_vbif *hw_vbif[VBIF_MAX]; + struct dpu_hw_vbif *hw_vbif; struct dpu_hw_mdp *hw_mdp; =20 bool has_danger_ctrl; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c b/drivers/gpu/drm/msm= /disp/dpu1/dpu_vbif.c index 6ebd9627514b..a4c5ca13179b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c @@ -11,14 +11,6 @@ #include "dpu_hw_vbif.h" #include "dpu_trace.h" =20 -static struct dpu_hw_vbif *dpu_get_vbif(struct dpu_kms *dpu_kms, enum dpu_= vbif vbif_idx) -{ - if (vbif_idx < ARRAY_SIZE(dpu_kms->hw_vbif)) - return dpu_kms->hw_vbif[vbif_idx]; - - return NULL; -} - static const char *dpu_vbif_name(enum dpu_vbif idx) { switch (idx) { @@ -170,7 +162,7 @@ void dpu_vbif_set_ot_limit(struct dpu_kms *dpu_kms, u32 ot_lim; int ret; =20 - vbif =3D dpu_get_vbif(dpu_kms, params->vbif_idx); + vbif =3D dpu_kms->hw_vbif; if (!vbif) { DRM_DEBUG_ATOMIC("invalid arguments vbif %d\n", vbif !=3D NULL); return; @@ -219,7 +211,7 @@ void dpu_vbif_set_qos_remap(struct dpu_kms *dpu_kms, return; } =20 - vbif =3D dpu_get_vbif(dpu_kms, params->vbif_idx); + vbif =3D dpu_kms->hw_vbif; =20 if (!vbif || !vbif->cap) { DPU_ERROR("invalid vbif %d\n", params->vbif_idx); @@ -255,16 +247,14 @@ void dpu_vbif_set_qos_remap(struct dpu_kms *dpu_kms, void dpu_vbif_clear_errors(struct dpu_kms *dpu_kms) { struct dpu_hw_vbif *vbif; - u32 i, pnd, src; - - for (i =3D 0; i < ARRAY_SIZE(dpu_kms->hw_vbif); i++) { - vbif =3D dpu_kms->hw_vbif[i]; - if (vbif && vbif->ops.clear_errors) { - vbif->ops.clear_errors(vbif, &pnd, &src); - if (pnd || src) { - DRM_DEBUG_KMS("%s: pnd 0x%X, src 0x%X\n", - dpu_vbif_name(vbif->idx), pnd, src); - } + u32 pnd, src; + + vbif =3D dpu_kms->hw_vbif; + if (vbif && vbif->ops.clear_errors) { + vbif->ops.clear_errors(vbif, &pnd, &src); + if (pnd || src) { + DRM_DEBUG_KMS("%s: pnd 0x%X, src 0x%X\n", + dpu_vbif_name(vbif->idx), pnd, src); } } } @@ -276,15 +266,12 @@ void dpu_vbif_clear_errors(struct dpu_kms *dpu_kms) void dpu_vbif_init_memtypes(struct dpu_kms *dpu_kms) { struct dpu_hw_vbif *vbif; - int i, j; - - for (i =3D 0; i < ARRAY_SIZE(dpu_kms->hw_vbif); i++) { - vbif =3D dpu_kms->hw_vbif[i]; - if (vbif && vbif->cap && vbif->ops.set_mem_type) { - for (j =3D 0; j < vbif->cap->memtype_count; j++) - vbif->ops.set_mem_type( - vbif, j, vbif->cap->memtype[j]); - } + int j; + + vbif =3D dpu_kms->hw_vbif; + if (vbif && vbif->cap && vbif->ops.set_mem_type) { + for (j =3D 0; j < vbif->cap->memtype_count; j++) + vbif->ops.set_mem_type(vbif, j, vbif->cap->memtype[j]); } } =20 --=20 2.47.3 From nobody Thu Apr 16 12:26:26 2026 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 1C34B392C28 for ; Fri, 27 Feb 2026 18:36:58 +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=1772217420; cv=none; b=FVeL57UwwRSHw1Nt0AoCLBofDNBvlB0k8qkkuvPBtK0IBZ3kXazy1PnyPOTZGlLw8a5U7QdQfwSgglC9ek19/qEAoXXiRYWadE//j8tWCkRNQ4THwwVEIflbGE7CYrYGOreBN2LFFzOt5YKTA/S8PTefSxfMKcXCabJld2tya64= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772217420; c=relaxed/simple; bh=S9urinrm97a3tn0MebL8/S1O8BaYIJcXVyoMPjUkJqA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HOIxEcnE+TkFvR+paBQKnLe3NKt/1bG5rQLUH88b/8OF9grP00LZAmqohSGy9zHoH2s8xEFMGWrCl78KrgxOGutE0ogLtCflIL+FL/RHsvoFU+M0QG92Ua3x81x7lMeppMz+7XyK5swMDlEBY3/NPdS44kSbRAhHltaTkjSx5lY= 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=oQaAyuiS; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=HVwdX58n; 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="oQaAyuiS"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="HVwdX58n" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 61RH0Rch010766 for ; Fri, 27 Feb 2026 18:36:58 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= /Mm3L5n1VZ9S77ktWqS8w18v1vJNzHKjRMTXqXcL5jg=; b=oQaAyuiS9eNefbL9 tV/wqaAUhIPnQABVgId1X3R/BKe2S1gtprDUR9jRarYx2dM1inc62D9ZuDa7jJB+ 9xwQThU8pYjmJM8EeU5o7m9Ip/v85H7C4THsKP03rG0i7e72asK/OgZYFu3np0TG Jy4OfBgCY/OYCEGqLH4DFSaCJ5734sT0FQcXK0uQ3YvWUvhXpKIXq7MDz4UNm0oB FbifJZqpkcmnp5lqwKfzrESNpug2jW3j9g2v7t06P65Bk1ovydF1MWAQztZU2EVY rzcWhoTvkBPZYn/LKkEgPo5tLYU6OquYDNUlhtE9j9r66tWWDIhkhTsQI/fB05Mg T1FkYQ== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cjuytv5f2-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 27 Feb 2026 18:36:58 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-8cb42f56c4aso2064306485a.3 for ; Fri, 27 Feb 2026 10:36:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1772217417; x=1772822217; 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=/Mm3L5n1VZ9S77ktWqS8w18v1vJNzHKjRMTXqXcL5jg=; b=HVwdX58n4aimTnu73EmJ01r8mvkVAZpcgB46IMN/xuTZb5SWjVkSgMrhm5c7FuRjl/ iRRg2jmTpKab1asfc6WeGmliWzCrXYnwq7beVVjSDKeZ+MgHioIgT6gnXIxosJ/CzS2i Ojf0ojDAvg1WFT6suYBZsq2kfQGeEsjlWpV4o8a62jJKta3VQBUaMfCsywAoBxxILZy3 ppOp8ItdzvTYTabsDDISA9Qz4gswXqttr2sYJ4LVPQlAmcjR9gt/2RW7HDme/mlnOZp5 NMRbd8bCX0r06RXySMiykni76Vch0MbgB0QmbXsZ10l9SOMtWTQKvARaLnPdcC/VMq/t H0wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772217417; x=1772822217; 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=/Mm3L5n1VZ9S77ktWqS8w18v1vJNzHKjRMTXqXcL5jg=; b=PrhrYUlwm4cfVAV7OyCrtfifnMb/3YLyE4RYuU7EER5sufHw0TpqcupKQLBxncPvtg 74ThaThRkAHzMqEQ2Lt4rC9W8gfOS3dln0S2R08HnEkj+cGX2Hqb07w2smO8nQetn2Bc 3Qhd3xxpNIHbJtmp2Rdm+hCVJBefB/NOs7EDX500yyaTxOSYByc81Ydf91M7fo3g13AB k8TwaHqfbHxFlkOsaXQJDlNtS9wIKt20NuC6TQdUP4/BK/51MM0ijqVpNhZUbm8hI6Gq aiITfnzd68xNIPidg7KBcFG3j3PTs6rriHEmtKcme1TnzQnYnGW5Xy+ayc6rkHW/XdIo 8Lbg== X-Forwarded-Encrypted: i=1; AJvYcCWDU4V84AeX2Du3ZUZhyXn/4/1oOMaHofd7j4Cloi7OjvNzdOpOJEGdTnn0VLJ6xre8DFfe/zE4y+WNrqo=@vger.kernel.org X-Gm-Message-State: AOJu0Yx6stEc09IqlTWve4HbECDnyUNf1xH6dTxIY+JFX83af0arPR4b ozQyt2KXnG1mhyeYOFqmjvXuidpw4VWT3V05BKOX1TlYzjMKTlG/bNWS3sgP7a2hknNUltyMer8 wkLcrxeM/BGNTqviLeypYXO6+00aTUH6XGFeodBdOj2b7zU/tYoIvlO37NEgSGTdcQ+A= X-Gm-Gg: ATEYQzzcsBjQlb1ysrpS6bF8ELZysQKkWIUMdqZ8yT5tRd3ZJLQXmNQ6snYEaZZkLtv HRedS+uxuAJt+eBqU7enZna191swtmRxrVawccghsnECjJqUpBttv1izwgnbPTHotAWuz70S3PZ EdlSjkiOb63vyTj0BDslbvBLWBO3QZ/EMXR+fhbzCvV8MOnTHpppFQLTHq4OuYqGSG33wgVpUCG Km8g4Zd9dcssJXvEMFrCcywftXNwZxHwUoMGVel8kLybJLrGVrPo1pfKFInvGvqHy49wdjyfEpQ VuUmesSZJ2qEzQaj28Fp+JkIb3BXRsOFkfIFos5yIdmnhPFC0pftx/Eq5FWaRTIQfgtWBTe7xe3 AO5rp0Pr9RVIfzjUvZPpWEvRAunN6z0IJoKtldEQToQ8p9nxoqD8kbi3g8tAwbw4AQjXHku0+t7 BAS84lOYJNPpvA+5vvCvQDQpMSjnAvJvXNhWs= X-Received: by 2002:a05:620a:4011:b0:8c9:fb29:e1a3 with SMTP id af79cd13be357-8cbc8ef6bc7mr512789885a.48.1772217417333; Fri, 27 Feb 2026 10:36:57 -0800 (PST) X-Received: by 2002:a05:620a:4011:b0:8c9:fb29:e1a3 with SMTP id af79cd13be357-8cbc8ef6bc7mr512786085a.48.1772217416863; Fri, 27 Feb 2026 10:36:56 -0800 (PST) Received: from umbar.lan (2001-14ba-a073-af00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a073:af00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5a115bca0e6sm117082e87.29.2026.02.27.10.36.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Feb 2026 10:36:56 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 27 Feb 2026 20:36:43 +0200 Subject: [PATCH 4/7] drm/msm/dpu: drop VBIF id, base and name from the catalog 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: quoted-printable Message-Id: <20260227-drop-vbif-nrt-v1-4-2b97d0438182@oss.qualcomm.com> References: <20260227-drop-vbif-nrt-v1-0-2b97d0438182@oss.qualcomm.com> In-Reply-To: <20260227-drop-vbif-nrt-v1-0-2b97d0438182@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=3909; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=S9urinrm97a3tn0MebL8/S1O8BaYIJcXVyoMPjUkJqA=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpoeQ+CwjYEc896d2hqJ0Ee+odN7dBHl7b7AB91 cdjqFd6Y/WJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaaHkPgAKCRCLPIo+Aiko 1QvpB/93wIfzoBNtsweJO61t0aiG5sRt2DjU6qiftXksBsD+WybqC+nfFt0/2bfKmfbwLTchMEi glGWAVbrB0UawhV4IgxHKZ34/FXiYDbOO6TacVTb3zswtkIvwMgYS/j5gS4mk6Da7EQY7eavbaQ aTxWXkGOMSoXzXSRjHdGIM5jvJ7FrTd7EysRqDVdZtUbbRBhh60HiKx7+lOCNw349u55WvMYsfr jMtJHWJ/0M4Eh3yRhWNc6ersyJyYCeCU5A7eM0xOrWu9pmHragRiCWHbAuvZoeqB/ItL+QsHbtN OXlPqlnMSbvaapdqMI9mhKSut4v1UeR8/TVc1hSYZottX/bB X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=bJIb4f+Z c=1 sm=1 tr=0 ts=69a1e44a cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=HzLeVaNsDn8A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=6fVEOi8AC71Pdc0kXHcA:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-ORIG-GUID: t3IcO46wiOKlPJLgYGzMFmcCGJuaDhRU X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMjI3MDE2NCBTYWx0ZWRfXyaiOSQQ47Mp6 cJwrgBGqp2gUXhc34lUD9mw8tAAroSFPMr4vH6ojKmf/Za24TmW1v067tedKliIlwED8JKfyxCD NMSGnalNKyO1m00dCI2pj8MjQry8VtsLAq6aQyR0knwAuxPas1JkmeerDmBr/uYAx5dN5B07rA7 RNfwTi+rTqq0ZFvKvkRrWzMmE4DXR2VZufeL9uem0HmaUV7/cqXN186X08irSgo7yLh1ty+6QT2 ixHB0PHaRafvqBDjaziLstEkJTeIqt2s9dkGlKdtQVaq/cKhEejO0zkkdFmyEqwa9+rUFxkUSIy QCYqHSDk/Ss9q+3KqyBJIIXr1rNn36j11fvAwd9KCWHCSoeVR/z7ICFZ8LfBA1YmQxIgIk4w4W2 3RBXFLRpTgFt0MrU5ixDOof/Q1OIG0G49dpmmvO9F+klqNTlau95tVZWAzR9v+uvv2paHPNI5be zMvji9n0rFBGO5R0Paw== X-Proofpoint-GUID: t3IcO46wiOKlPJLgYGzMFmcCGJuaDhRU X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-02-27_03,2026-02-27_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 bulkscore=0 adultscore=0 phishscore=0 suspectscore=0 impostorscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2602270164 For all the platforms VBIF id is VBIF_RT, the name and base are also fixed. Drop those fields from the catalog. Signed-off-by: Dmitry Baryshkov Reviewed-by: Konrad Dybcio --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 15 +++++---------- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 5 ++--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c | 4 ++-- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/d= rm/msm/disp/dpu1/dpu_hw_catalog.c index 94c70b7b789e..35c75e11fe82 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -514,8 +514,7 @@ static const struct dpu_vbif_dynamic_ot_cfg msm8998_ot_= rdwr_cfg[] =3D { }; =20 static const struct dpu_vbif_cfg msm8996_vbif =3D { - .name =3D "vbif_rt", .id =3D VBIF_RT, - .base =3D 0, .len =3D 0x1040, + .len =3D 0x1040, .default_ot_rd_limit =3D 32, .default_ot_wr_limit =3D 16, .features =3D BIT(DPU_VBIF_QOS_REMAP) | BIT(DPU_VBIF_QOS_OTLIM), @@ -540,8 +539,7 @@ static const struct dpu_vbif_cfg msm8996_vbif =3D { }; =20 static const struct dpu_vbif_cfg msm8998_vbif =3D { - .name =3D "vbif_rt", .id =3D VBIF_RT, - .base =3D 0, .len =3D 0x1040, + .len =3D 0x1040, .default_ot_rd_limit =3D 32, .default_ot_wr_limit =3D 32, .features =3D BIT(DPU_VBIF_QOS_REMAP) | BIT(DPU_VBIF_QOS_OTLIM), @@ -568,8 +566,7 @@ static const struct dpu_vbif_cfg msm8998_vbif =3D { }; =20 static const struct dpu_vbif_cfg sdm845_vbif =3D { - .name =3D "vbif_rt", .id =3D VBIF_RT, - .base =3D 0, .len =3D 0x1040, + .len =3D 0x1040, .features =3D BIT(DPU_VBIF_QOS_REMAP), .xin_halt_timeout =3D 0x4000, .qos_rp_remap_size =3D 0x40, @@ -586,8 +583,7 @@ static const struct dpu_vbif_cfg sdm845_vbif =3D { }; =20 static const struct dpu_vbif_cfg sm8550_vbif =3D { - .name =3D "vbif_rt", .id =3D VBIF_RT, - .base =3D 0, .len =3D 0x1040, + .len =3D 0x1040, .features =3D BIT(DPU_VBIF_QOS_REMAP), .xin_halt_timeout =3D 0x4000, .qos_rp_remap_size =3D 0x40, @@ -604,8 +600,7 @@ static const struct dpu_vbif_cfg sm8550_vbif =3D { }; =20 static const struct dpu_vbif_cfg sm8650_vbif =3D { - .name =3D "vbif_rt", .id =3D VBIF_RT, - .base =3D 0, .len =3D 0x1074, + .len =3D 0x1074, .features =3D BIT(DPU_VBIF_QOS_REMAP), .xin_halt_timeout =3D 0x4000, .qos_rp_remap_size =3D 0x40, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/d= rm/msm/disp/dpu1/dpu_hw_catalog.h index fda4f3bdd797..38280d776c72 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -587,8 +587,7 @@ struct dpu_vbif_qos_tbl { =20 /** * struct dpu_vbif_cfg - information of VBIF blocks - * @id enum identifying this block - * @base register offset of this block + * @len: length of hardware block * @features bit mask identifying sub-blocks/features * @ot_rd_limit default OT read limit * @ot_wr_limit default OT write limit @@ -602,7 +601,7 @@ struct dpu_vbif_qos_tbl { * @memtype array of xin memtype definitions */ struct dpu_vbif_cfg { - DPU_HW_BLK_INFO; + u32 len; unsigned long features; u32 default_ot_rd_limit; u32 default_ot_wr_limit; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c b/drivers/gpu/drm/= msm/disp/dpu1/dpu_hw_vbif.c index af76ad8a8103..de70d6b00972 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c @@ -230,13 +230,13 @@ struct dpu_hw_vbif *dpu_hw_vbif_init(struct drm_devic= e *dev, if (!c) return ERR_PTR(-ENOMEM); =20 - c->hw.blk_addr =3D addr + cfg->base; + c->hw.blk_addr =3D addr; c->hw.log_mask =3D DPU_DBG_MASK_VBIF; =20 /* * Assign ops */ - c->idx =3D cfg->id; + c->idx =3D VBIF_RT; c->cap =3D cfg; _setup_vbif_ops(&c->ops, c->cap->features); =20 --=20 2.47.3 From nobody Thu Apr 16 12:26:26 2026 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 E5D3E392C42 for ; Fri, 27 Feb 2026 18:37:00 +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=1772217423; cv=none; b=f7cr7UJxX1p/LlVasX8TLhY/3YqQrOh7eGPmjtZJXnF3N1A2xneJCAPEVvTKaSgUkXWCkFokQYHRhVHv4z6IXtwgWC1wYIy0y3huW+OG43rT9i0CKNWi0szfZg+svSIRpmd6A0fU38LVA0XvzP/2L9qP5IDnMtZNmr0jPW4T3Mk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772217423; c=relaxed/simple; bh=0vf2C9fVpmFXUgBb3ij4/FQRHZu47w7a3ZKZ+YzMMY8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=e9tnVGZslJTdwCzm+a2ry5QV1CoRsr6JL37yKElqpH/lW4oz0nlb4XRFilqfGAHD5PGF4z3bhpmlOxxrv9Di6ZfJMwG9IJd/JZImv7MCUtrneYv78DaN6FYPmgd3oRWjjRC5CY/mYdtnuF0MkB5PnaAxdz+Fk+5nWln4xsm32Ok= 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=OCxHMObx; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=XQZiBZiL; 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="OCxHMObx"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="XQZiBZiL" 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 61RH0IfV3944667 for ; Fri, 27 Feb 2026 18:37:00 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= Z28n3bH/P4ishBBooloUI2Ybx7yvclEZDbQ1q5+4f/c=; b=OCxHMObxZtWbYTjh WNuj3gJvN+fBgV47v2Upv1XaXXG3r3pH1g2GToL3er4CEnpNRPeLpAcP0JoKpfox y46Y0Xkydh5anHMGmll4+tWKa6wTPeUOqOw1kTD6jwibfnro89a6ORe09FVAYx66 63JUeLF15v5AaQqDtujoaMq38rKPE957Ttj7XS2jixwBUs2q/9p+ZzE9OCl394+R PcY8DVOLPt8U1xORt5w+Q1kv6DPireO13HSeGVUg3I/+MeV9LhU9pX0ZTmHlp+Zn gPQjVtalS/ZcqQb1sv8Y6Y0EJx69vtCbnUYW4ruqSg97Ct8XX9AAmjbVS257wYvW i3b3lw== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ck73q22cj-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 27 Feb 2026 18:36:59 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-8cb413d0002so1947431685a.1 for ; Fri, 27 Feb 2026 10:36:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1772217419; x=1772822219; 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=Z28n3bH/P4ishBBooloUI2Ybx7yvclEZDbQ1q5+4f/c=; b=XQZiBZiLy0RMslEUPGYa2gwdEjJ2crwxa+MaVc70zq4GeUWUQnyrXK4reeU6DS44m8 BoUzj+yyX/5zPox1WOjnDF0fOqQWpFShMhV7ToYl7iQOfC6QdsZ6IP852Qdu+1l20VLY UNAgeH2VE4l8+PUxQE31QLDGQ2FbWROAHJ1ebipvLz9E9d13P8EuZvSDu9/h6tWd+o42 bC1eprOoZamtiB4sgnXw/1L04cBSUnDChS2b+QNqoxUADFG3Oe24ztZ3FLQLa9EX0U7K txpYoJPdOclKwpkHfeVmFxUnaIseAX/u4IFAtTyUQMwJUQz1UfQ9xjPgzga5fTbkzZ6J 6onA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772217419; x=1772822219; 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=Z28n3bH/P4ishBBooloUI2Ybx7yvclEZDbQ1q5+4f/c=; b=oyM63PtBloIiSJM8ewhK1ra9iuaUzvKSGSbKd66w31Y66LP4ThRFkKpEjw1ga0DOU7 c1HvN70Ck7umS98Rm4EyNuNNbk4CP/duYy6CDkB9GRGYxRvvxrQz8Zfj+3Q8xeLe4VE+ mgf7oOROPhDgV/xqCeisSs9Cs5S5gBoYWxUpXQXyb3SKXbrvlriR0iF9Fv7xt16IQ9lF 6GLwRVu5lnle0/VIv7kvBydKevY1xgctTljgPw0T9HdcgndkS9reJkrM77Y6CjOwjGPj n96U7wm9S3m8HJxLxNYdPmpAcaO4QRdWkNB9lC0N9M/CdMMYAY+k7l4/Na7EsF2KVkJU hHrw== X-Forwarded-Encrypted: i=1; AJvYcCXhGsC47d1xaitoWvujpOiGkGE9JXkMSrfIR2XUrarvedxYjHnWAZU9ggNulkYToe1k4O+XyITdy2lGWSY=@vger.kernel.org X-Gm-Message-State: AOJu0YzWm6oEpPWGHawh+uqjRCRcucw60XfXROdkrZjPgStNkdDLbfCF JKQjDtDFLKURcWIzj0OmXn3ptfutg5LVshRXky1MxBsGwH43SESyx+EC4PZ924hbHH+XRuzuY5k 4uaWF31zTk92OG9hcQBMpc2YzknwU3SJQey60g59dT+1tesud0qNOObk5LpRik21M4DI= X-Gm-Gg: ATEYQzwEW+Y5Yus1QJhTScWNAe38/vt1KHEVBjc5R4F+zVce/1WW83wihnv62pg8M7U il9DcJQeEwV0bGpYLvAMDGrquEgCd98TMZ0RFJfemjgmSAgXn3TUWwHWgHHrDDwjW4WdRXIAkYl pFLvW6QHhFka0T6UmgzWNwU/Pc2RdGhbzkjwSL4rPTvR3jVESsoo9o6IPlFQ5psGBY3KJcp8QrH oyoMtvbfDj0+aEXIwQsNQEX22LFVbmsOtE116KzdXFNTnEq0Nf/UxOkp4C1DdiHHqdN61eYqrMi bHfzsOGzLcDDxgibu7pY/w1qa7BM2s7K07FfYUsIiXxryv7iBcXsQxDFAU/t2pJeUFzJDYanphv Sbr/h4wRGS8MWzkzE+Vaf1bf19+C7b7ea2HGCYhWv8XA2hDDPbnRAATF2/3vPhtAYCUD0A8JiSg /mw9MS2u45JH2Rm+ewriUjolN5ap0FZOsMUbs= X-Received: by 2002:a05:620a:4008:b0:8c5:3045:854f with SMTP id af79cd13be357-8cbbf3e721emr918722685a.30.1772217419227; Fri, 27 Feb 2026 10:36:59 -0800 (PST) X-Received: by 2002:a05:620a:4008:b0:8c5:3045:854f with SMTP id af79cd13be357-8cbbf3e721emr918717785a.30.1772217418624; Fri, 27 Feb 2026 10:36:58 -0800 (PST) Received: from umbar.lan (2001-14ba-a073-af00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a073:af00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5a115bca0e6sm117082e87.29.2026.02.27.10.36.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Feb 2026 10:36:57 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 27 Feb 2026 20:36:44 +0200 Subject: [PATCH 5/7] drm/msm/dpu: drop vbif_idx from WB configuration 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: quoted-printable Message-Id: <20260227-drop-vbif-nrt-v1-5-2b97d0438182@oss.qualcomm.com> References: <20260227-drop-vbif-nrt-v1-0-2b97d0438182@oss.qualcomm.com> In-Reply-To: <20260227-drop-vbif-nrt-v1-0-2b97d0438182@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=14870; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=0vf2C9fVpmFXUgBb3ij4/FQRHZu47w7a3ZKZ+YzMMY8=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpoeQ+Z2ACnJzJKGH2CekVQYUhBL/9FUkFtBbcA BOvmg2oTn+JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaaHkPgAKCRCLPIo+Aiko 1RdoB/9s1K6fKPB3ODkWvkJbSp6/8fS+SUpoxffEr6wbOm0TjuCiOUScsRpQmsFiZ6Cobt22oqV c3s2fHXhXl9VZqvFOPFFsE9lHArO20hMpaGmgkG9BDPs8YDVX8SODZLp/9e/qPosgfaLlLaaOgT JH4LM6K4IcX293CqM6U1/+ONbtZ0KkT96g60UGPrKeksF52nAYLYP6bScr6y2gt5dJXyH4TmEA6 RfGsmIrpBL+yAlNtkcNG7XDqbd+u+YCYV26mBc6Hv3hmdKYlR0z8aBXfbCOvdDK2L6B5WTtn9YJ kJ8Iuu7WeqYefgbgB4Jrp3Z++klQfr1l4e+nGh3du6K6ELiG X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMjI3MDE2NCBTYWx0ZWRfXwJxSpUpTemmH uck5uXFAe17vd2mW78rHTL99Q0GXyFexcxaHIBJzqcBTFpZMAJhEK+ABHIWpHDjwX41Et62ttN0 lBBW63T/ZENn3ztOPKcgAQgRwfTMpuoYMY9bAocy+t7RJpAYPyIDzxo1Bn1Ldz/gOrq+v6s0vI4 2Gyg4hfxlU2L2k9x6UnZVQ5JC+T48YKi5M6IBGe3NmMwy1MshX818K3Vj3HceL6v/IWJ/5RP0l8 XMOU7nizaMHAsRSQ9ZvMyZFJON2jYk7xnumROTyLmUmYzEI6YeMAwc2DpptjMPacWMGAEXMQM79 bRjs+ieQw/tuVN4jMT2nd8V6wNcXRJTNYkQFquUvG2DJVDWK4X4FsRduzMKQ0699J9zaa4lRB0f VK8FO1jzySuqEhSVY/46fiaFZiXEvYcNVbvYU6EIWTiSAf9aVUJK4QRUgIzs851laJovoqDtwOO mgg4y4bRWyiaqHF3Q6A== X-Authority-Analysis: v=2.4 cv=KL9XzVFo c=1 sm=1 tr=0 ts=69a1e44c cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=HzLeVaNsDn8A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=elt7qAbBOBJlC7s2ZbsA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-ORIG-GUID: HFHxflwSns4njjIbUrZ_anuyC1X_km9- X-Proofpoint-GUID: HFHxflwSns4njjIbUrZ_anuyC1X_km9- X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-02-27_03,2026-02-27_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 clxscore=1015 malwarescore=0 priorityscore=1501 adultscore=0 bulkscore=0 phishscore=0 impostorscore=0 lowpriorityscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2602270164 All MDP / DPU implementations except for MSM8996 use VBIF_RT (or the only VBIF) for WB2. Writeback on MSM8996 is not supported (nor planned to be supported). In order to simplify the driver, drop the field form the struct dpu_wb_cfg. Signed-off-by: Dmitry Baryshkov Reviewed-by: Konrad Dybcio --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_12_0_sm8750.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_12_2_glymur.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_13_0_kaanapali.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 6 ++++-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 -- 21 files changed, 4 insertions(+), 23 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h index b31cb6f16f33..db79f9382f8b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h @@ -322,7 +322,6 @@ static const struct dpu_wb_cfg sm8650_wb[] =3D { .format_list =3D wb2_formats_rgb_yuv, .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .xin_id =3D 6, - .vbif_idx =3D VBIF_RT, .maxlinewidth =3D 4096, .intr_wb_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 4), }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_12_0_sm8750.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_12_0_sm8750.h index b0c38b2e38c4..59caa2c2a87c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_12_0_sm8750.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_12_0_sm8750.h @@ -364,7 +364,6 @@ static const struct dpu_wb_cfg sm8750_wb[] =3D { .format_list =3D wb2_formats_rgb_yuv, .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .xin_id =3D 6, - .vbif_idx =3D VBIF_RT, .maxlinewidth =3D 4096, .intr_wb_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 4), }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_12_2_glymur.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_12_2_glymur.h index f6fd79a48537..5e24309b4674 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_12_2_glymur.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_12_2_glymur.h @@ -371,7 +371,6 @@ static const struct dpu_wb_cfg glymur_wb[] =3D { .format_list =3D wb2_formats_rgb_yuv, .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .xin_id =3D 6, - .vbif_idx =3D VBIF_RT, .maxlinewidth =3D 4096, .intr_wb_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 4), }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_13_0_kaanapali.h b/d= rivers/gpu/drm/msm/disp/dpu1/catalog/dpu_13_0_kaanapali.h index 02d2de6073f8..bf1940d9c9e9 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_13_0_kaanapali.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_13_0_kaanapali.h @@ -362,7 +362,6 @@ static const struct dpu_wb_cfg kaanapali_wb[] =3D { .format_list =3D wb2_formats_rgb_yuv, .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .xin_id =3D 6, - .vbif_idx =3D VBIF_RT, .maxlinewidth =3D 4096, .intr_wb_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 4), }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h index 9f43ce8bf31b..e61e14572aff 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h @@ -280,7 +280,6 @@ static const struct dpu_wb_cfg sm8150_wb[] =3D { .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .clk_ctrl =3D DPU_CLK_CTRL_WB2, .xin_id =3D 6, - .vbif_idx =3D VBIF_RT, .maxlinewidth =3D 4096, .intr_wb_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 4), }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h index 14611a344371..fb18de029e80 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h @@ -286,7 +286,6 @@ static const struct dpu_wb_cfg sc8180x_wb[] =3D { .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .clk_ctrl =3D DPU_CLK_CTRL_WB2, .xin_id =3D 6, - .vbif_idx =3D VBIF_RT, .maxlinewidth =3D 4096, .intr_wb_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 4), }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h index 7b97e3b8630e..ffb89a03cfad 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h @@ -246,7 +246,6 @@ static const struct dpu_wb_cfg sm7150_wb[] =3D { .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .clk_ctrl =3D DPU_CLK_CTRL_WB2, .xin_id =3D 6, - .vbif_idx =3D VBIF_RT, .maxlinewidth =3D 4096, .intr_wb_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 4), }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h index 65fbd006720d..427ecd4cbf63 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h @@ -158,7 +158,6 @@ static const struct dpu_wb_cfg sm6150_wb[] =3D { .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .clk_ctrl =3D DPU_CLK_CTRL_WB2, .xin_id =3D 6, - .vbif_idx =3D VBIF_RT, .maxlinewidth =3D 2160, .intr_wb_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 4), }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h index c7833ca05eb4..64be51e30159 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h @@ -137,7 +137,6 @@ static const struct dpu_wb_cfg sm6125_wb[] =3D { .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .clk_ctrl =3D DPU_CLK_CTRL_WB2, .xin_id =3D 6, - .vbif_idx =3D VBIF_RT, .maxlinewidth =3D 2160, .intr_wb_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 4), }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h index 09ca22b93e68..c481e964fca0 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h @@ -317,7 +317,6 @@ static const struct dpu_wb_cfg sm8250_wb[] =3D { .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .clk_ctrl =3D DPU_CLK_CTRL_WB2, .xin_id =3D 6, - .vbif_idx =3D VBIF_RT, .maxlinewidth =3D 4096, .intr_wb_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 4), }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h index 3adc3350f05b..d6f7ee24ca93 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h @@ -153,7 +153,6 @@ static const struct dpu_wb_cfg sc7180_wb[] =3D { .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .clk_ctrl =3D DPU_CLK_CTRL_WB2, .xin_id =3D 6, - .vbif_idx =3D VBIF_RT, .maxlinewidth =3D 4096, .intr_wb_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 4), }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h index 7b58e438f597..dd891703e35f 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h @@ -147,7 +147,6 @@ static const struct dpu_wb_cfg sm6350_wb[] =3D { .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .clk_ctrl =3D DPU_CLK_CTRL_WB2, .xin_id =3D 6, - .vbif_idx =3D VBIF_RT, .maxlinewidth =3D 1920, .intr_wb_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 4), }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h index a3fea0ade688..9afdfdb3be6f 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h @@ -290,7 +290,6 @@ static const struct dpu_wb_cfg sm8350_wb[] =3D { .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .clk_ctrl =3D DPU_CLK_CTRL_WB2, .xin_id =3D 6, - .vbif_idx =3D VBIF_RT, .maxlinewidth =3D 4096, .intr_wb_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 4), }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h index ce38e93c0d7e..99b8a890fddc 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h @@ -172,7 +172,6 @@ static const struct dpu_wb_cfg sc7280_wb[] =3D { .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .clk_ctrl =3D DPU_CLK_CTRL_WB2, .xin_id =3D 6, - .vbif_idx =3D VBIF_RT, .maxlinewidth =3D 4096, .intr_wb_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 4), }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h index 9983a297b68a..d3f08d0d2d6f 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h @@ -303,7 +303,6 @@ static const struct dpu_wb_cfg sm8450_wb[] =3D { .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .clk_ctrl =3D DPU_CLK_CTRL_WB2, .xin_id =3D 6, - .vbif_idx =3D VBIF_RT, .maxlinewidth =3D 4096, .intr_wb_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 4), }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h index cb2513785f5f..f89e7e0df663 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h @@ -310,7 +310,6 @@ static const struct dpu_wb_cfg sa8775p_wb[] =3D { .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .clk_ctrl =3D DPU_CLK_CTRL_WB2, .xin_id =3D 6, - .vbif_idx =3D VBIF_RT, .maxlinewidth =3D 4096, .intr_wb_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 4), }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h index 384ed6e86fc2..c0b954001f3a 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h @@ -298,7 +298,6 @@ static const struct dpu_wb_cfg sm8550_wb[] =3D { .format_list =3D wb2_formats_rgb_yuv, .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .xin_id =3D 6, - .vbif_idx =3D VBIF_RT, .maxlinewidth =3D 4096, .intr_wb_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 4), }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h index 6777eb75faec..e6a5d2eb57ac 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h @@ -298,7 +298,6 @@ static const struct dpu_wb_cfg sar2130p_wb[] =3D { .format_list =3D wb2_formats_rgb_yuv, .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .xin_id =3D 6, - .vbif_idx =3D VBIF_RT, .maxlinewidth =3D 4096, .intr_wb_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 4), }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h index b5e2d832666d..2958017eee56 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h @@ -298,7 +298,6 @@ static const struct dpu_wb_cfg x1e80100_wb[] =3D { .format_list =3D wb2_formats_rgb_yuv, .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .xin_id =3D 6, - .vbif_idx =3D VBIF_RT, .maxlinewidth =3D 4096, .intr_wb_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 4), }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c b/drivers/= gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c index 6d28f2281c76..73021aaa8d3f 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c @@ -70,7 +70,8 @@ static void dpu_encoder_phys_wb_set_ot_limit( ot_params.height =3D phys_enc->cached_mode.vdisplay; ot_params.is_wfd =3D !dpu_encoder_helper_get_cwb_mask(phys_enc); ot_params.frame_rate =3D drm_mode_vrefresh(&phys_enc->cached_mode); - ot_params.vbif_idx =3D hw_wb->caps->vbif_idx; + /* XXX: WB on MSM8996 should use VBIF_NRT */ + ot_params.vbif_idx =3D VBIF_RT; ot_params.rd =3D false; =20 if (!_dpu_encoder_phys_wb_clk_force_ctrl(hw_wb, phys_enc->dpu_kms->hw_mdp, @@ -108,7 +109,8 @@ static void dpu_encoder_phys_wb_set_qos_remap( hw_wb =3D phys_enc->hw_wb; =20 memset(&qos_params, 0, sizeof(qos_params)); - qos_params.vbif_idx =3D hw_wb->caps->vbif_idx; + /* XXX: WB on MSM8996 should use VBIF_NRT */ + qos_params.vbif_idx =3D VBIF_RT; qos_params.xin_id =3D hw_wb->caps->xin_id; qos_params.num =3D hw_wb->idx - WB_0; qos_params.is_rt =3D dpu_encoder_helper_get_cwb_mask(phys_enc); diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/d= rm/msm/disp/dpu1/dpu_hw_catalog.h index 38280d776c72..8dbd5ab967ff 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -524,7 +524,6 @@ struct dpu_intf_cfg { /** * struct dpu_wb_cfg - information of writeback blocks * @DPU_HW_BLK_INFO: refer to the description above for DPU_HW_BLK_INFO - * @vbif_idx: vbif client index * @maxlinewidth: max line width supported by writeback block * @xin_id: bus client identifier * @intr_wb_done: interrupt index for WB_DONE @@ -535,7 +534,6 @@ struct dpu_intf_cfg { struct dpu_wb_cfg { DPU_HW_BLK_INFO; unsigned long features; - u8 vbif_idx; u32 maxlinewidth; u32 xin_id; unsigned int intr_wb_done; --=20 2.47.3 From nobody Thu Apr 16 12:26:26 2026 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 4D4C2395D9B for ; Fri, 27 Feb 2026 18:37:02 +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=1772217425; cv=none; b=khbWQ0ldRwTSuFXFlgUSOVU3LdbbrwO2e4/Sq2qXhAM0/jB2VoYN/55Gf3FRu35TfieFcgkNKlJGk9KqPC2P6tLL58VFF9J4qIVoamQuVve3Qe0JLs6pDaVM6h+fK93Aey6TGZmxJX6qM5cnntgwhNoMJKBPqRZvWePZ/gyPwzU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772217425; c=relaxed/simple; bh=VurcZtQ6s0/YP/v7Sm5xJziSsCDBKjb5TpLb/Bs7EUQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LoISn9/O8b7Thmw2/kJF4i4eXt97jc6UaTRCPRFF4b5O0358QuGtD4uSLzTLt/PypnBY8xcYbZUCTHR81u0zgtM1ANrf80LL+/+HZEEB+1Hgjpst9oWI/tWMTN+uXzeT1+PW6quDbOQqa1o276NRSiHqAhsWap845WFcLr8qFwQ= 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=Dmjd9Nrm; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=D3FbSJDX; 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="Dmjd9Nrm"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="D3FbSJDX" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 61RH0fFQ527828 for ; Fri, 27 Feb 2026 18:37:01 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= bC4OwYK0WXchZ0n/YT8oYdnIO5WKpNPqkJXXEobBytw=; b=Dmjd9NrmHF4Su2Ph v/3T3MfHPFOg0z7JIMI0qbgIaLTuwcgQ1kQE0T0UwK32lQBUgDe6m4/edXT8DDuE By4zbyV4TI91t5PfqfkO5ujcppSvxbxChTiysgubFUBbR+Rw4Fj/Sk4oMVEiYp7w 2p3YwJRr5/KbYfuaVKHTxosjjThCcF1B2ullHJPh/2n7TphX1jTWF1oYlEC4SUW2 mK7fiqPmF1Avztk/IlRU24x6Ob+WUU7jY1MJ/Vw6y/hAtbWzWYxug1SpyxV4IhqH PRJgrQPUi8pS7EePXmqXMATTQrbvFi1gwPL9fNKFPCwiaAF41kwuJP4VNJBCJPjQ bHSO8A== 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 4cjw23bxmf-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 27 Feb 2026 18:37:01 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-8cb4817f3c8so1630505685a.3 for ; Fri, 27 Feb 2026 10:37:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1772217421; x=1772822221; 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=bC4OwYK0WXchZ0n/YT8oYdnIO5WKpNPqkJXXEobBytw=; b=D3FbSJDXc8mcIm3MyvlZOhOHjcAVsnAKR8VZoPzSxoCtQs+NwaBh8uxKm53j0KUhyM QnFIIn2xdMzIDxhFu7WHBZbO0WjDnSao0iIGh7+TGn67h0RxYxxUhNbClC1AZTY+8Q5R 3dAh4LVdUlgxtdmeEtsMvXU7nAl3xEnvLcKpq/uaxWDm2tKWORE6QOnzJ4HCxLpW19vg 58ScnC/BJNGYln2PeMkAy6G8Syfa1BQP8IGhyxDAiCHNkv0SSQCkXcsfHituK97PRa96 1zZoHqRvNomjoRinRPzYeQ489dvyqGMQhAAKYbxT/5Ps7JYd2Fa0AYuc/UrxMoTVZsbM HWkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772217421; x=1772822221; 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=bC4OwYK0WXchZ0n/YT8oYdnIO5WKpNPqkJXXEobBytw=; b=lL2GMb5/8+I9eq3w36fHGfzwOkqnUSHTFF7A2Jaz1LAAIzckYKtG0/gAm6a6z1v5DE vyF6rQCPbYFiiZr2O5+VkpmIG++lNBzS+W2WurhIOEgkVRN6k6/B974A4wgkslWcpLDG NKLkc6KXSHsMEo4AIqEFTALRIpAon1UjoQEtHFzb3pM5hQpDASLjCGPUoTemBSMnZXqM JoFFPh16lFHj48opsTK/C0ZtTw91H036vy5hfOtHJ/JpHE1ST86yMk99pv3HydaMQdms 4rvqvCZjAEmcTLtbZVVa8ckL+whP0+51RrKChefJtrHG5c0Cmedr+h4/MBq+uqweDcYj 5ZGw== X-Forwarded-Encrypted: i=1; AJvYcCWbN70Kta9KbA7eWB3/UkiM4jqdYPzU0pKMZ8TFx2x5ju04aBg58r01sIIwbWay61dPzIPs3STIYnIRS7U=@vger.kernel.org X-Gm-Message-State: AOJu0YxMQAkaWU+oQrkeU/uxi1ac8cpohC/6BHTUmoVOwyvKv2ipu9Ul souI/kHwqMulrsK19FpTqgZd+Uq5r3LqyPFApoc41zlE9/XregKO2S0d5+CqqOLr9ypbeJ0eINT xBReLWUWEvR7iN9yWK+ktOfX0XM2/UB8IbMij9tdBRXYcR6TSjLonl6rcJM53EhRHKOc= X-Gm-Gg: ATEYQzzYVeFGZ36GEwAms/260uoyqetal4HOTr5ZH5CrSb4D1CVoQvIdjFRcSOgyZ7N 3Vs+Zr2aR0z1uyuT29IzXJbvUWc8bb1Buhim8ksV97ObUvvg8ydskOJ9ug2PEr/w6gU7lGCXvAQ wKPsxngK//BPW7F2lsJYQkvWONrm4ewONKdqT9ckgZyt64EpgouI7O5iXW9z71gwpZnZsRLygOj FN+6znviY5m/3h1gtVuOMNKRa88ZOAqugFdhZ0YWTtW6SQVztyF8l8rolXhNf1HA8eX18av5nIe e6pISw42Kgb3i5D69E+w4tbWz/snNIEfZa8B9ImB1vUzLTVfjdO+NAnl7En7Ac6PT/4gGZNh8Ri ed8yjdB7myFC0+HDuPWEXb38VLdTzThPiXgrNrnDo5ruJYtHMb9Jn3RiO78YpN04nZYlzNQL0Ni B4vx5xdMpu9CveXth8x612zDR3aVJcCzkvyaM= X-Received: by 2002:a05:620a:4626:b0:8b2:e1d7:ca6a with SMTP id af79cd13be357-8cbc8e3750cmr509209185a.75.1772217420306; Fri, 27 Feb 2026 10:37:00 -0800 (PST) X-Received: by 2002:a05:620a:4626:b0:8b2:e1d7:ca6a with SMTP id af79cd13be357-8cbc8e3750cmr509204385a.75.1772217419726; Fri, 27 Feb 2026 10:36:59 -0800 (PST) Received: from umbar.lan (2001-14ba-a073-af00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a073:af00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5a115bca0e6sm117082e87.29.2026.02.27.10.36.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Feb 2026 10:36:59 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 27 Feb 2026 20:36:45 +0200 Subject: [PATCH 6/7] drm/msm/dpu: drop VBIF index from the VBIF params 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: quoted-printable Message-Id: <20260227-drop-vbif-nrt-v1-6-2b97d0438182@oss.qualcomm.com> References: <20260227-drop-vbif-nrt-v1-0-2b97d0438182@oss.qualcomm.com> In-Reply-To: <20260227-drop-vbif-nrt-v1-0-2b97d0438182@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=7138; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=VurcZtQ6s0/YP/v7Sm5xJziSsCDBKjb5TpLb/Bs7EUQ=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQ+bCJ3ZvdkmemeFRdvPf09c/u144RWwvKTyVoy7urrxAl bU1R/NAJ6MxCwMjF4OsmCKLT0HL1JhNyWEfdkythxnEygQyhYGLUwAmsngd+/8MJo7CvJ873Xad d/7mUZ+vxrCSM+OkQpHv9fJpnMtvVc0Pbq+909l6/sSZ6DmLXWJUmD/WTko8c439sg9Xacr1y/t CTF4EJR516VStiL1jzdm69pKjl2VqqSr/iwl1n8r0wuZZP5PM0fkQKrTsiXP0rNsFG6deuqVvPX G5pHNSWJsO71q1VLbZ6+bc1mu+xfywL5Rv6X2GDL2kql4xQ78FKhslLu5VvrN2dh6D+wwRJifJ3 g1vu2RWeZ8VzWx6/M+udtm6ww2cQs+/ak8Wdn1++cw9fn22BOfmP+VvXhSuDfuSG9NY1u0sXDnZ 7HASQ0PZI4vIuKyC3d9WnojqE/9XmnK8nee8nP9Fkd7bAA== X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: 5m3__YRgqF-CrQ0xtNFzYPkmcgJU8Cpk X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMjI3MDE2NCBTYWx0ZWRfX3TNTACS44J9W 3YsHJ7j8Nj8KoSLlN6LoOdkvDAoZ0pxWiz0O/QtsadXSd7fziIOeX52ehEI5+qoYMWZQmqd+VNH Kb2S159o/XjUg2bZZPBijs2HCaAoPf1qtL997PBKD2laPytLuQ3Hc1l81OiIODhxlIR0ufxJ0yD 8cIDWm4EFbmPeEJGEKgKNHM6E/glDC9A+RTizssJoezZcBQJdPt4l1/3HxqrUdYLpMMwiFYxlrO +qgwpeGjy+gd5lmLQzrDeuL1Abxta20biK2PmtNY7P64PCaFYbrMhj2KV87JIJhbzAEMBK0dku8 K3e9myZ/iHvkGHB8+GLb7HWjYbvhloNshBhnbsf3nzmmZDwtMeCxDdsFvrdPSZtYQTDNZfpERkv zl0d/FiXeKjHDt58ih2XIQ6Bl/FNIemV983W1UfQ9gvaCsY5diQBkzCj9CAOB7gOmzmRupSc0A5 Hjp30YEXuFoRw+B+uhA== X-Authority-Analysis: v=2.4 cv=cJHtc1eN c=1 sm=1 tr=0 ts=69a1e44d cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=HzLeVaNsDn8A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=EUspDBNiAAAA:8 a=kWJvl8zPePrAsXnfLXgA:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-ORIG-GUID: 5m3__YRgqF-CrQ0xtNFzYPkmcgJU8Cpk X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-02-27_03,2026-02-27_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 impostorscore=0 lowpriorityscore=0 phishscore=0 adultscore=0 spamscore=0 clxscore=1015 priorityscore=1501 suspectscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2602270164 Since we don't support and don't use VBIF_NRT, VBIF_RT is the only possible VBIF type. To simplify the driver, drop vbif_idx from the VBIF parameter structures. Signed-off-by: Dmitry Baryshkov Reviewed-by: Konrad Dybcio --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 5 +---- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 5 +---- drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 19 +++++++----------= -- drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 11 +++++------ drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.h | 4 ---- 5 files changed, 14 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c b/drivers/= gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c index 73021aaa8d3f..22433bfbea1e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c @@ -71,7 +71,6 @@ static void dpu_encoder_phys_wb_set_ot_limit( ot_params.is_wfd =3D !dpu_encoder_helper_get_cwb_mask(phys_enc); ot_params.frame_rate =3D drm_mode_vrefresh(&phys_enc->cached_mode); /* XXX: WB on MSM8996 should use VBIF_NRT */ - ot_params.vbif_idx =3D VBIF_RT; ot_params.rd =3D false; =20 if (!_dpu_encoder_phys_wb_clk_force_ctrl(hw_wb, phys_enc->dpu_kms->hw_mdp, @@ -110,14 +109,12 @@ static void dpu_encoder_phys_wb_set_qos_remap( =20 memset(&qos_params, 0, sizeof(qos_params)); /* XXX: WB on MSM8996 should use VBIF_NRT */ - qos_params.vbif_idx =3D VBIF_RT; qos_params.xin_id =3D hw_wb->caps->xin_id; qos_params.num =3D hw_wb->idx - WB_0; qos_params.is_rt =3D dpu_encoder_helper_get_cwb_mask(phys_enc); =20 - DPU_DEBUG("[qos_remap] wb:%d vbif:%d xin:%d is_rt:%d\n", + DPU_DEBUG("[qos_remap] wb:%d xin:%d is_rt:%d\n", qos_params.num, - qos_params.vbif_idx, qos_params.xin_id, qos_params.is_rt); =20 if (!_dpu_encoder_phys_wb_clk_force_ctrl(hw_wb, phys_enc->dpu_kms->hw_mdp, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/ms= m/disp/dpu1/dpu_plane.c index 547d084f2944..6d23e10b493b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c @@ -374,7 +374,6 @@ static void _dpu_plane_set_ot_limit(struct drm_plane *p= lane, ot_params.height =3D drm_rect_height(&pipe_cfg->src_rect); ot_params.is_wfd =3D !pdpu->is_rt_pipe; ot_params.frame_rate =3D frame_rate; - ot_params.vbif_idx =3D VBIF_RT; ot_params.rd =3D true; =20 if (!_dpu_plane_sspp_clk_force_ctrl(pipe->sspp, dpu_kms->hw_mdp, @@ -402,14 +401,12 @@ static void _dpu_plane_set_qos_remap(struct drm_plane= *plane, bool forced_on =3D false; =20 memset(&qos_params, 0, sizeof(qos_params)); - qos_params.vbif_idx =3D VBIF_RT; qos_params.xin_id =3D pipe->sspp->cap->xin_id; qos_params.num =3D pipe->sspp->idx - SSPP_VIG0; qos_params.is_rt =3D pdpu->is_rt_pipe; =20 - DPU_DEBUG_PLANE(pdpu, "pipe:%d vbif:%d xin:%d rt:%d\n", + DPU_DEBUG_PLANE(pdpu, "pipe:%d xin:%d rt:%d\n", qos_params.num, - qos_params.vbif_idx, qos_params.xin_id, qos_params.is_rt); =20 if (!_dpu_plane_sspp_clk_force_ctrl(pipe->sspp, dpu_kms->hw_mdp, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h b/drivers/gpu/drm/ms= m/disp/dpu1/dpu_trace.h index cb24ad2a6d8d..805d117493da 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h @@ -72,23 +72,20 @@ TRACE_EVENT(dpu_perf_set_danger_luts, ); =20 TRACE_EVENT(dpu_perf_set_ot, - TP_PROTO(u32 pnum, u32 xin_id, u32 rd_lim, u32 vbif_idx), - TP_ARGS(pnum, xin_id, rd_lim, vbif_idx), + TP_PROTO(u32 pnum, u32 xin_id, u32 rd_lim), + TP_ARGS(pnum, xin_id, rd_lim), TP_STRUCT__entry( __field(u32, pnum) __field(u32, xin_id) __field(u32, rd_lim) - __field(u32, vbif_idx) ), TP_fast_assign( __entry->pnum =3D pnum; __entry->xin_id =3D xin_id; __entry->rd_lim =3D rd_lim; - __entry->vbif_idx =3D vbif_idx; ), - TP_printk("pnum:%d xin_id:%d ot:%d vbif:%d", - __entry->pnum, __entry->xin_id, __entry->rd_lim, - __entry->vbif_idx) + TP_printk("pnum:%d xin_id:%d ot:%d", + __entry->pnum, __entry->xin_id, __entry->rd_lim) ) =20 TRACE_EVENT(dpu_cmd_release_bw, @@ -861,17 +858,15 @@ TRACE_EVENT(dpu_rm_reserve_lms, ); =20 TRACE_EVENT(dpu_vbif_wait_xin_halt_fail, - TP_PROTO(enum dpu_vbif index, u32 xin_id), - TP_ARGS(index, xin_id), + TP_PROTO(u32 xin_id), + TP_ARGS(xin_id), TP_STRUCT__entry( - __field( enum dpu_vbif, index ) __field( u32, xin_id ) ), TP_fast_assign( - __entry->index =3D index; __entry->xin_id =3D xin_id; ), - TP_printk("index:%d xin_id:%u", __entry->index, __entry->xin_id) + TP_printk("xin_id:%u", __entry->xin_id) ); =20 TRACE_EVENT(dpu_pp_connect_ext_te, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c b/drivers/gpu/drm/msm= /disp/dpu1/dpu_vbif.c index a4c5ca13179b..d33231f1d50b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c @@ -180,8 +180,7 @@ void dpu_vbif_set_ot_limit(struct dpu_kms *dpu_kms, if (ot_lim =3D=3D 0) return; =20 - trace_dpu_perf_set_ot(params->num, params->xin_id, ot_lim, - params->vbif_idx); + trace_dpu_perf_set_ot(params->num, params->xin_id, ot_lim); =20 vbif->ops.set_limit_conf(vbif, params->xin_id, params->rd, ot_lim); =20 @@ -189,7 +188,7 @@ void dpu_vbif_set_ot_limit(struct dpu_kms *dpu_kms, =20 ret =3D _dpu_vbif_wait_for_xin_halt(vbif, params->xin_id); if (ret) - trace_dpu_vbif_wait_xin_halt_fail(vbif->idx, params->xin_id); + trace_dpu_vbif_wait_xin_halt_fail(params->xin_id); =20 vbif->ops.set_halt_ctrl(vbif, params->xin_id, false); } @@ -214,7 +213,7 @@ void dpu_vbif_set_qos_remap(struct dpu_kms *dpu_kms, vbif =3D dpu_kms->hw_vbif; =20 if (!vbif || !vbif->cap) { - DPU_ERROR("invalid vbif %d\n", params->vbif_idx); + DPU_ERROR("invalid vbif\n"); return; } =20 @@ -232,8 +231,8 @@ void dpu_vbif_set_qos_remap(struct dpu_kms *dpu_kms, } =20 for (i =3D 0; i < qos_tbl->npriority_lvl; i++) { - DRM_DEBUG_ATOMIC("%s xin:%d lvl:%d/%d\n", - dpu_vbif_name(params->vbif_idx), params->xin_id, i, + DRM_DEBUG_ATOMIC("VBIF xin:%d lvl:%d/%d\n", + params->xin_id, i, qos_tbl->priority_lvl[i]); vbif->ops.set_qos_remap(vbif, params->xin_id, i, qos_tbl->priority_lvl[i]); diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.h b/drivers/gpu/drm/msm= /disp/dpu1/dpu_vbif.h index 62e47ae1e3ee..f47a89cb34ea 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.h @@ -15,24 +15,20 @@ struct dpu_vbif_set_ot_params { u32 frame_rate; bool rd; bool is_wfd; - u32 vbif_idx; }; =20 struct dpu_vbif_set_memtype_params { u32 xin_id; - u32 vbif_idx; bool is_cacheable; }; =20 /** * struct dpu_vbif_set_qos_params - QoS remapper parameter - * @vbif_idx: vbif identifier * @xin_id: client interface identifier * @num: pipe identifier (debug only) * @is_rt: true if pipe is used in real-time use case */ struct dpu_vbif_set_qos_params { - u32 vbif_idx; u32 xin_id; u32 num; bool is_rt; --=20 2.47.3 From nobody Thu Apr 16 12:26:26 2026 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 5DAA5396D03 for ; Fri, 27 Feb 2026 18:37:03 +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=1772217425; cv=none; b=mtpCckqO/oOVNo553n52hVAbDsw+JPTAEXYBvDZU+x8wjC1mc2eT0MynlvaWqGYzOpEKBcyNxJEUXBBG0K+QdOjwd7c6GIr47jx4MgzRDtF/ZZ1rGyYB0MQlIdBt3FQgnVCgnXmNC5RJLPdzwtqFSsrytlRSa06jOtXR+CMX6vc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772217425; c=relaxed/simple; bh=dte0nYEc0ewgpu8HO4OB4g6OuUwdq1FY8Aaod4fPrG4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZAtyTr6cM1fAOVolYx/qgjQDdZPRq1mnxjtOdwH6PjXzn2Gixlc1+pivKh2khUeXu6B4SPeeWP7CFJeb+LNUNDdrhu0zPf0blz3lulF+yMHlVEctsqiG401M0ePn++B9kk7z/H9gi6Rqvf7fdhxL5gB8/04Lerdr4GlmatjXZh8= 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=DgYKNAC4; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=GENniv7U; 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="DgYKNAC4"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="GENniv7U" 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 61RH0HTC1912491 for ; Fri, 27 Feb 2026 18:37:02 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= n+4gYFk5re0nH67EqAjd5y6zdk0Xk7vxJi2bsbftFBk=; b=DgYKNAC4Q9b7GUmK lBJXRyNs9TIM9MOq3UV4jSu7EF49ufXQZzjJ24826Q0vCxs4ArhtxSVplw5mmSIy 1AfOW+dxv1RYDqPB141heq32tJZ031qw0t+10oFXMXk3IQpFZHy+v3R5/KPs8R7R OASIIHo09J6+V7RgNTcPIEtdbmNm4eXL/4pfMnEjSRymNAO89zZAs4gwBNmrlFpz 0tlyfPaGp8v/BwVB/auo4HZdW5LMGFNCDq5L5/ByJ4uNC8d/hLML+TJbghG7IFR/ AUdCeCpZErvUAgbtuEPZm4dUXsEPT98MwhF2XZyuJAm0W15XQI5hRzu4TLf5K35I jL5VDg== Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cjuur45sj-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 27 Feb 2026 18:37:02 +0000 (GMT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-50341fddb89so184653331cf.3 for ; Fri, 27 Feb 2026 10:37:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1772217421; x=1772822221; 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=n+4gYFk5re0nH67EqAjd5y6zdk0Xk7vxJi2bsbftFBk=; b=GENniv7U/FuDaJ8GpQo1RF6bWyAA96qp0Hkis7UKZ/mLjIaCGriIjONg3DoKtIh3HJ ngP6RkrGFqYA901wG2gpr/+dqudWPcMIhOuhYjfcqtPzB30GhaKvikQ9wl2Yqwz3MHU3 CHkPSNqfSxP7qEgiEFxi8ypAyAPx8iEnhUCDGVROSzAteS5rU5pDMB1knofPWBmEwoUT nWSz7r6Oi6c9PhePfRKDoISTG6x+VVPa6mhmU/fQXAcgNdfH/n0igu01XJBiYuEbdD73 0nonG9kkLAoqgJbmZJABjPC2bscnRyK5K9xFYp/FMGQQtwDetLLW6YZdZ3qNn3nq6JBe 3n3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772217421; x=1772822221; 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=n+4gYFk5re0nH67EqAjd5y6zdk0Xk7vxJi2bsbftFBk=; b=o4WWHwEeN+PbA2WKmtwHOLdEtiiKnfyrV4Ve4AJUcPvifaxJFZn5UgFavLpJpibXyv V2Q15UI3wC6G7G/6WPbfeQuQlCzqvRNhFfs+87V/6Az2l3AbFVP6Onoqia7irgQ0gawl 8Bpt84MJf8NCy2aF6e207OGduD+Kqmb3Lr1GDWdYityJC+77aqQN4dn+NQzK7Cr8v04f qmQeOZ7jewuuFg9CyVGrEtAd1paGgibQZaAXmI6f2SvXJY4n9iXs0Cxn/8r5gfMgisqM oxIZDSt6xQXsz48f1aL+KBh2WnCJfhrVo6RWhJzeQjFqazdX9LajNFLyVAmquLL3No2/ RgXA== X-Forwarded-Encrypted: i=1; AJvYcCWMvj3dP0IE7EsSYvJkjyHZTXsuoMvzXt1CEwG38RlBB1LavCpwrkrRw9h++2QXp+tz4LTX+YvyS6XSqNQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxfvWJ/wnmdd0J6jLXjh6c+Ajq3k1F453+0RzDPNQkPlg7jprZn 0qcemGhD0a6O9TXqxrvuwLMAjueGcAEmCQpsselkCtQaJWSiXbhsaHhf83+Umx/7Qw+MQjvY0F8 dXcGQ1eglXFBgtrCGgSmuduC4yGKNElllVW+2Y00e3Fqhw0gddcTFr9w13VB01Do6ByY= X-Gm-Gg: ATEYQzyxFmd9D4SF8DzWB55w1k3sDDIlRfJBB8/1SvKle0OSKKG5GIA2zG9EPOU5IgJ RWHDf8pb/3sLjkgrV2k2qPlSoLF2XQfVRDRehjjzLjWq9w3EfglxxfFbY5PFQZWahze4ySMxr1a NvnIFBGR9KGTs9Y4kVBm0AjKAD5EagCR4lYh0tnxu0Mq4TL1NRoHvALNlr5jqu1wR/n4P1DKM7N nC61uJ2+TDpI9G7rDnxjOhx769QshenYw7XHJmX5viKyS5WfLDQvA93GPevS9zyVMl9N+xxccMS EWBGgvwuLC58V6lcUupk0TYj5uhWDoraF5vZYhKukY711Mkn2htRvb+gpDND6olfEdhaYfBVWW2 ePWauIvGDdnILwZgSlQvAVViHdnMPvEPV8Did8PaMkdDkbgXAwn3YZicbXzB+ICc3Xm1O5Sm7hI O6o33MfAsrkxpOtGjD6XkOVyrvSddUz52W5gQ= X-Received: by 2002:a05:620a:4608:b0:8c9:f8e5:9f12 with SMTP id af79cd13be357-8cbc8dfb5afmr473791485a.57.1772217421436; Fri, 27 Feb 2026 10:37:01 -0800 (PST) X-Received: by 2002:a05:620a:4608:b0:8c9:f8e5:9f12 with SMTP id af79cd13be357-8cbc8dfb5afmr473787585a.57.1772217420934; Fri, 27 Feb 2026 10:37:00 -0800 (PST) Received: from umbar.lan (2001-14ba-a073-af00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a073:af00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5a115bca0e6sm117082e87.29.2026.02.27.10.36.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Feb 2026 10:37:00 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 27 Feb 2026 20:36:46 +0200 Subject: [PATCH 7/7] drm/msm/dpu: drop VBIF index from the struct dpu_hw_vbif 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: quoted-printable Message-Id: <20260227-drop-vbif-nrt-v1-7-2b97d0438182@oss.qualcomm.com> References: <20260227-drop-vbif-nrt-v1-0-2b97d0438182@oss.qualcomm.com> In-Reply-To: <20260227-drop-vbif-nrt-v1-0-2b97d0438182@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=4106; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=dte0nYEc0ewgpu8HO4OB4g6OuUwdq1FY8Aaod4fPrG4=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpoeQ+dq1W256FoCKe9hdi2ebZ+9ZiAVPssnNZf XLXCG6HqBGJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaaHkPgAKCRCLPIo+Aiko 1Qk4B/0RZT+xLbthmmGio2SIYM+9NC87C2Z601o3sEKm9T+cJqs/Jqeg1brX/+qJWpB6VjERwkQ LcRCQj563cJSuTxT4YcKSb6+4nSp7IuEOQ4X4NbBDw6P7e9M8s2B6Aq/nK7v7tRBkhZ0e3Tl8ZI ZvpOMT8Cl7HxG2dTtBAYIlMstpswFJfNWcVlO06frSwnydUd5M01ZlIuKyx6Fpc0SqV/i7cgZC8 9Nf4WpYUAt36xK081daO3TLgf7+VLeBGSYziDWcelCOGL+k6v++TcKnPRoCse7xzfQ7jZOMAY8A jB4IS7ughAhRshQE7fhWKU0Y2R/SB+xWWhtbe1xQAPWg3B1c X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: p-ErHyYjjo6ZW5agH7yfNEUDE5CjDuXX X-Authority-Analysis: v=2.4 cv=PN8COPqC c=1 sm=1 tr=0 ts=69a1e44e cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=HzLeVaNsDn8A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=Rro-Jn1WIAMZ-BlAJUcA:9 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMjI3MDE2NCBTYWx0ZWRfX6ZInWa9Jz01g q8Rz3jLYqbJctCNVyE2lQf62XvVHOhRmFIr4g7W423Jlg/Dss/WhyD5Xmek8EVgO+zCyv0hnbT6 KoJ78QDcD7ogrBHCPef07KofJV4ohIIMp6Cg8f2zcPKw8J7sboH9f04Yq3ikmKs89/zNJSsIfn3 4K5+9Ms40aI0hFtqCu2EN4dQhdTOd1DX8KCmZYZ950p5LKdNhb/9+Hb0ZINhHc93kOBEYz/U9Sy mQr4/gcYR5G+09d+ZKVztRx+Fjx7DmwFUCOWUvpqmLSLCrdJtrHKs5TUNzh2mYSubNhDeXFw1Zo 74RLxuENmW85IkUY++JZH3aGiac7X9tz2bIRYd4DCdgB++ahjSEaA8M5tEnqelKLtoCRdJ7sHV2 y439IOTlgwbBLAjcres4dVwmVkaRKp4LBo8w1Rj8A7gjD9zCKaesdgyM3Ebr1yYMKpLW29eAKQ4 RoQpZDTH9QnTlw1T3Gg== X-Proofpoint-ORIG-GUID: p-ErHyYjjo6ZW5agH7yfNEUDE5CjDuXX X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-02-27_03,2026-02-27_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 spamscore=0 phishscore=0 suspectscore=0 bulkscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2602270164 Since we don't support and don't use VBIF_NRT, VBIF_RT is the only possible VBIF type. To simplify the driver, drop vbif_idx from the VBIF instance structure. As the last users of VBIF_RT and enum dpu_vbif are gone, drop them too. Signed-off-by: Dmitry Baryshkov Reviewed-by: Konrad Dybcio --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.h | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 30 ++++++++-----------------= ---- 4 files changed, 8 insertions(+), 28 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h b/drivers/gpu/drm/= msm/disp/dpu1/dpu_hw_mdss.h index a169628eb512..0e65bf5ddc4a 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h @@ -284,10 +284,6 @@ enum dpu_wd_timer { WD_TIMER_MAX }; =20 -enum dpu_vbif { - VBIF_RT, -}; - /** * enum dpu_3d_blend_mode * Desribes how the 3d data is blended diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c b/drivers/gpu/drm/= msm/disp/dpu1/dpu_hw_vbif.c index de70d6b00972..112df3f31e2b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c @@ -236,7 +236,6 @@ struct dpu_hw_vbif *dpu_hw_vbif_init(struct drm_device = *dev, /* * Assign ops */ - c->idx =3D VBIF_RT; c->cap =3D cfg; _setup_vbif_ops(&c->ops, c->cap->features); =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.h b/drivers/gpu/drm/= msm/disp/dpu1/dpu_hw_vbif.h index 9ac49448e432..96ec4e35e549 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.h @@ -98,7 +98,6 @@ struct dpu_hw_vbif { struct dpu_hw_blk_reg_map hw; =20 /* vbif */ - enum dpu_vbif idx; const struct dpu_vbif_cfg *cap; =20 /* ops */ diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c b/drivers/gpu/drm/msm= /disp/dpu1/dpu_vbif.c index d33231f1d50b..0c6fa9bb0cb6 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c @@ -11,16 +11,6 @@ #include "dpu_hw_vbif.h" #include "dpu_trace.h" =20 -static const char *dpu_vbif_name(enum dpu_vbif idx) -{ - switch (idx) { - case VBIF_RT: - return "VBIF_RT"; - default: - return "??"; - } -} - /** * _dpu_vbif_wait_for_xin_halt - wait for the xin to halt * @vbif: Pointer to hardware vbif driver @@ -52,12 +42,10 @@ static int _dpu_vbif_wait_for_xin_halt(struct dpu_hw_vb= if *vbif, u32 xin_id) =20 if (!status) { rc =3D -ETIMEDOUT; - DPU_ERROR("%s client %d not halting. TIMEDOUT.\n", - dpu_vbif_name(vbif->idx), xin_id); + DPU_ERROR("VBIF client %d not halting. TIMEDOUT.\n", xin_id); } else { rc =3D 0; - DRM_DEBUG_ATOMIC("%s client %d is halted\n", - dpu_vbif_name(vbif->idx), xin_id); + DRM_DEBUG_ATOMIC("VBIF client %d is halted\n", xin_id); } =20 return rc; @@ -97,10 +85,10 @@ static void _dpu_vbif_apply_dynamic_ot_limit(struct dpu= _hw_vbif *vbif, } } =20 - DRM_DEBUG_ATOMIC("%s xin:%d w:%d h:%d fps:%d pps:%llu ot:%u\n", - dpu_vbif_name(vbif->idx), params->xin_id, - params->width, params->height, params->frame_rate, - pps, *ot_lim); + DRM_DEBUG_ATOMIC("VBIF xin:%d w:%d h:%d fps:%d pps:%llu ot:%u\n", + params->xin_id, + params->width, params->height, params->frame_rate, + pps, *ot_lim); } =20 /** @@ -143,8 +131,7 @@ static u32 _dpu_vbif_get_ot_limit(struct dpu_hw_vbif *v= bif, } =20 exit: - DRM_DEBUG_ATOMIC("%s xin:%d ot_lim:%d\n", - dpu_vbif_name(vbif->idx), params->xin_id, ot_lim); + DRM_DEBUG_ATOMIC("VBIF xin:%d ot_lim:%d\n", params->xin_id, ot_lim); return ot_lim; } =20 @@ -252,8 +239,7 @@ void dpu_vbif_clear_errors(struct dpu_kms *dpu_kms) if (vbif && vbif->ops.clear_errors) { vbif->ops.clear_errors(vbif, &pnd, &src); if (pnd || src) { - DRM_DEBUG_KMS("%s: pnd 0x%X, src 0x%X\n", - dpu_vbif_name(vbif->idx), pnd, src); + DRM_DEBUG_KMS("VBIF: pnd 0x%X, src 0x%X\n", pnd, src); } } } --=20 2.47.3