From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 605EEFD88EB for ; Wed, 11 Mar 2026 03:23:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D176910E7C2; Wed, 11 Mar 2026 03:23:37 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="NiwBQHBf"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="WhsaxEWA"; dkim-atps=neutral Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0667B10E7C9 for ; Wed, 11 Mar 2026 03:23:35 +0000 (UTC) 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 62B36N4B1573018 for ; Wed, 11 Mar 2026 03:23:35 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= nJxnxNjXEHAomyQpf6dxP3G900o6a7htory/+Plg2ys=; b=NiwBQHBfujfdlSs+ 2wk2SyMCW2OhIC02hPtaCwJHPhXgsFV1FeWWkSfTZyA91PhOoHiEG8Ut8LB3VemR qzfYACJT5sXdkaQ+kngHMAF8aBa3/aMHHIqKudoDiL7xVnsVzxGsziwEjzNzBfUI Wg+ehUMzaJZCkVCXJRN8eTyynCGcsxhTGNLBJSUuvaP0o1GUihAZZKdOzOFcdR8f wjJAp0Rt76aaNXcemM9a+MjbTDLXEDhhpjfDpRyETzFFp30GjpU1sVZ/3WlB4M3Q 3sb2KhYQv6dg363V3YBdZHZMqTjZgQiAELUq6NBag+rFXwBv+0JcC7tNuM9J/3JM OiWtGA== Received: from mail-vs1-f70.google.com (mail-vs1-f70.google.com [209.85.217.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctqgk9r9s-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:23:35 +0000 (GMT) Received: by mail-vs1-f70.google.com with SMTP id ada2fe7eead31-5ffa0b00da1so9008637137.3 for ; Tue, 10 Mar 2026 20:23:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199414; x=1773804214; darn=lists.freedesktop.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=nJxnxNjXEHAomyQpf6dxP3G900o6a7htory/+Plg2ys=; b=WhsaxEWA6IWPGkSItAYr//v6DwKkXoIC6LNQpcYnHhaePAktkHQrS6wyq2OJCWakg9 vw8miuWRHgSuSYW3LTt0Fd9idbs59l2aYzoXPMkQH2XIB7qzQtkEuV6gHIMz3ycUkc7R eWUwMSVVjJDTBCKbH8cMqDur+BGOBE+A1zGXuJs9cFZrXUF7fEdlHD5aVmKHw/2JgcQ1 60qV7P9dMbnXxoRiYfi9BE/TflNjdrUL2szT+z7pQE1LHoaXaK8RB+63461Xt93AnNaw S1EFI02EHvdCRcL3zebSwDyu1/jPAu0sktCO6t2oYxG2obZhrgVEFwX///t73cp2Tosu ZQWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199414; x=1773804214; 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=nJxnxNjXEHAomyQpf6dxP3G900o6a7htory/+Plg2ys=; b=O3MdXHjNWOvX8Bl/Sr9ogFd9+cu/U1cX4VilyApnk2hGYYL2xUq3xLqtH7gYN9Wfsd IGMKlTGZ43eo4/0eszV6hOu6d88kprjXO6ppIQbWUBos0pz0u2SsYxeMS7XALOoNFCdt jKneshHQrhyeIcwjzs0TKzv/wdtyzWIDMneTtB+aYmnUXF7DP1Js2IIl3JlqlrWFyfn9 96Lgibyv2gH0Fa4gSIxp7XTTHRAzqTx+jrXqhUN1hTA2jOIMyGwdIcw1cdW1wji33+Wt yUZ9lH6gDpvpg31/53e2HXsSPR6/BL6FK6Lc+WHG2UllrSRzX974d4rwsuqs3XEbKavj UnJA== X-Forwarded-Encrypted: i=1; AJvYcCWEyFCx/mAvxh/5wQpJiv+ybjEzvtTOEMyTH2dOGlMN4u8QpXUVp+qb26D/j89bQtBAR/NU8JBQ+Yc=@lists.freedesktop.org X-Gm-Message-State: AOJu0YxLWVmr882HHM7vbPM/E5RX6CD8vA/sSxTVCB0RDNO0J+Emn6xk MPlInOmcw9ejP23VPRGD0NbzlEnqvDjPmFiSBvlvv4QLlLtzI+W2CxPwcyJVR3AHW0a4vpvoVBD pVciLXd0Grd2UYgzUJrt+DoE9llgcsxCtwK3gqSvDtKfau5eAtF3p09agywD1pnpz+LtZ5u4= X-Gm-Gg: ATEYQzyXv8YYCM4gKASCY8mOIj7EIujyj0WfqnotkVFFIApdkLIHu50/aKW1FNDBo71 DndIJ2OFoKrbrKrf5lD8LG4a0gWrzsvZ7yi0KqTyzyHQFJ9NKy96lR44AjlU06Ka9WOjAZDLHWZ N/tNngq9yPaPcs1lRF+1VwTU+88h31IW0aiSa4WLgbLl4wb7NDgZLLtqEXkxmTQVPSX2XWF3x5n dPhIzk0o2eBUuow6rS8WKzp6/CmmWGQtI8FC3bn0H9Doo4D8041ajSeuS1HhEKqwEC3sOKmeIc0 GW9iDemjHoY6B7rRnGGAWC0UXPAh6fSgeVNvUrPni7YSXaHbwvbCEpTyuHKeIHxFYeBquw7lAOp lyBW8fN9OkL81Rc4vGqQO+LQsW7L5jXUGKJJJC/nAny3bq2Yik2CkEeKSkmYViMNmDU2QmkuLtg JJa5n2LAROnsw1u9icrigPYtqFS1lHfKQeXw4= X-Received: by 2002:a05:6102:50a4:b0:5fa:603:1d62 with SMTP id ada2fe7eead31-601deb9bf32mr368671137.14.1773199413767; Tue, 10 Mar 2026 20:23:33 -0700 (PDT) X-Received: by 2002:a05:6102:50a4:b0:5fa:603:1d62 with SMTP id ada2fe7eead31-601deb9bf32mr368656137.14.1773199413354; Tue, 10 Mar 2026 20:23:33 -0700 (PDT) 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 38308e7fff4ca-38a67e5ed41sm1422721fa.25.2026.03.10.20.23.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:23:32 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:23:00 +0200 Subject: [PATCH v2 06/25] drm/msm/mdss: use qcom_ubwc_version_tag() helper MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260311-ubwc-rework-v2-6-69f718f2a1c9@oss.qualcomm.com> References: <20260311-ubwc-rework-v2-0-69f718f2a1c9@oss.qualcomm.com> In-Reply-To: <20260311-ubwc-rework-v2-0-69f718f2a1c9@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen 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=1601; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=wXJJ0dAZpKF1rU+9v2j++kD4vXhMZtkbkrtjqNCMm+I=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsOAdAoshTUBFF7gu/dmTFUGS5vZ+v78q9e178 17nAHXN1qiJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabDgHQAKCRCLPIo+Aiko 1ch8B/99JWkX0Pkso2rCvaimmcGAFzKsPXaNaGGs1r3r44m4kho81YF8axNq+ATyYyXAcyPIKUV 60g5lTgSj8etZVXDaiot2Fq05qtkw7JnBF9X+lk/zdQptaB/HkB4fS3td+GgvXtB0ydeQ72vgmy hO85TykY/KIN3NRH5ABVsOvP4Q0Ry/DvAZNQqDwo8+9EBftixeirl7x8ox5HXAMIy8hv7kzHSQB fB5yquJCe3/vJ4GzTczBHtWoGkZT3J+uMKBh3+TSDGqxSxXlNNP08SjuGQUQMcDXcY6sAJhwj5D pGDKhyj0bRFUO9qAcHkaBQQJLwtdUtfR8NuQGaqYo88Tcm/c X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: 5puuJBl1zhSiDn06jNxNvkqdSazjEff6 X-Proofpoint-ORIG-GUID: 5puuJBl1zhSiDn06jNxNvkqdSazjEff6 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfXzICICfPZUlAz Is2frslU6r3bdOmtQE+ycjLwXPl9GPvekG7IwqpZ4PH1joDtPg4UQ3cGur2ERztE4dFK5QdM5Gh Wq5IFVjXS1nEwwI7aILxFf5yWC3NVyc3whOLS7HmwygT2Xy624Px1CNbzpgs5PsO3AXHk4dZwAs SD6yeoTuKB2oBjW+6dy+mla1qFdpKwa0+MRsUumVAGqp8k9M2vSbaXUGtLp45jO5JK+kpG3ugcY g57jqZkKiXQra4EwJFAaAKuyQF59bZnRQLgyaY05rfXvO6UkjkBliAjLMJY5+ppoUXCjvWu8DGT 5fJ1rAEhSfXE6Y9brAaiHyvoyB8CYB7pxdgV0FCKhcYMCxD29vOsl5f77myqv2XS6zvfjGnY9+6 hHxmrsX4FfRndMX1k0aHSfKROutdhBEL7Wp7X2ecwvpGhZbKhTXf9vVM4HGvypuWugDksNCtQOK /NDQMfe0QItabjGDudg== X-Authority-Analysis: v=2.4 cv=M4JA6iws c=1 sm=1 tr=0 ts=69b0e037 cx=c_pps a=N1BjEkVkxJi3uNfLdpvX3g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=EUspDBNiAAAA:8 a=Xd8vOn4_dRUKSRNknbIA:9 a=QEXdDO2ut3YA:10 a=crWF4MFLhNY0qMRaF8an:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-10_05,2026-03-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 adultscore=0 lowpriorityscore=0 phishscore=0 impostorscore=0 spamscore=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-2603110026 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Use new helper defined to program UBWC version to the hardware. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/msm_mdss.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c index d8b0288f0040..497db0ce28bd 100644 --- a/drivers/gpu/drm/msm/msm_mdss.c +++ b/drivers/gpu/drm/msm/msm_mdss.c @@ -204,7 +204,7 @@ static void msm_mdss_6x_setup_ubwc(struct msm_mdss *msm_mdss) const struct qcom_ubwc_cfg_data *data = msm_mdss->mdss_data; u32 value = MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle) | MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit - 13); - u32 ver, prediction_mode; + u32 prediction_mode; if (data->ubwc_bank_spread) value |= MDSS_UBWC_STATIC_UBWC_BANK_SPREAD; @@ -222,20 +222,8 @@ static void msm_mdss_6x_setup_ubwc(struct msm_mdss *msm_mdss) else prediction_mode = 1; - if (data->ubwc_enc_version >= UBWC_6_0) - ver = 5; - else if (data->ubwc_enc_version >= UBWC_5_0) - ver = 4; - else if (data->ubwc_enc_version >= UBWC_4_3) - ver = 3; - else if (data->ubwc_enc_version >= UBWC_4_0) - ver = 2; - else if (data->ubwc_enc_version >= UBWC_3_0) - ver = 1; - else /* UBWC 1.0 and 2.0 */ - ver = 0; - - writel_relaxed(ver, msm_mdss->mmio + REG_MDSS_UBWC_CTRL_2); + writel_relaxed(qcom_ubwc_version_tag(data), + msm_mdss->mmio + REG_MDSS_UBWC_CTRL_2); writel_relaxed(prediction_mode, msm_mdss->mmio + REG_MDSS_UBWC_PREDICTION_MODE); } -- 2.47.3