From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 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: 7bit 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 --- 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 }; -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 = VBIF_RT; c->cap = cfg; _setup_vbif_ops(&c->ops, c->cap->features); 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; /* vbif */ - enum dpu_vbif idx; const struct dpu_vbif_cfg *cap; /* 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" -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_vbif *vbif, u32 xin_id) if (!status) { rc = -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 = 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); } return rc; @@ -97,10 +85,10 @@ static void _dpu_vbif_apply_dynamic_ot_limit(struct dpu_hw_vbif *vbif, } } - 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); } /** @@ -143,8 +131,7 @@ static u32 _dpu_vbif_get_ot_limit(struct dpu_hw_vbif *vbif, } 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; } @@ -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); } } } -- 2.47.3