From nobody Wed Apr 8 01:18:32 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 4237C3290C9 for ; Wed, 11 Mar 2026 03:23:22 +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=1773199403; cv=none; b=KT03zxc8onApWHa5hlqrGfMHQQgpxTkqKUWpo0ZQW3YGXG3DymEUZAVOmVI2+Coci1OS1ym/Gce1lsovOQU6vR+sWUuHS2g07Ry8rdckW+Z2p57ymch68zz9tctXN9J33af9k5JBO4OvHE9GGqR8wgHNIYQ0qUqMTHS/eD/v8Fs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199403; c=relaxed/simple; bh=uSnw+FGxAf1+lIyAZwtg2QGOswUDFmlVWOT07uiqNc4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nXSApJbR1sWPoyzgpJqEAOHpV/kbjMqxP+clK3PzwFxjN36wnojXZcdDMVhtfSJiFv7KUsQ7lW2NQzXQSOyeAg6n0acpUFAnNHqeip7p/K8/sAqnTS9WMmKWocUg2d6WWUnqjzHdhIci+2wWbBb3N3QXejmxBO+sdRUdhgldp7Q= 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=mBqQFKbb; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=H2caCwIB; 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="mBqQFKbb"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="H2caCwIB" 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 62B1ZcBN508675 for ; Wed, 11 Mar 2026 03:23:21 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= KDZZPG9DkNIoQAYC/ZQxpoKTbgw+/Pi/qUEgyBqUeUo=; b=mBqQFKbbO/V+Rc5G cz+jOpsOD1eQO79WD2MsOy7K3yJLqyYA8w/F2uzgvSdhBUtpxUHOHfeojxEujTr3 layt1dO05KYP5II5K6cZBXzD/y8yytThBo5I7CbHsYZdFaAyAL8I6vCi8rCjqo7F IvcuawqsFerOgv9H+kDf7Xt4R61lIcLlcuaM7M20c08Jx9J/puQ8fNFfaZICGisa g1RpAYHP4XuxBUFFNGI1Y+1t4UuXGTMce+GO/mMc/M5VMPf51mx+ofIgg/Q9gFJn wqWSp+67rb9dRUVkuOY1lzIUG3Y0OL4s9EEYpaDVB8grNY9AmDT/bSY+WwMnvFFN rds5IA== Received: from mail-vk1-f199.google.com (mail-vk1-f199.google.com [209.85.221.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctppaj0yj-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:23:20 +0000 (GMT) Received: by mail-vk1-f199.google.com with SMTP id 71dfb90a1353d-56afd606ff0so8770905e0c.3 for ; Tue, 10 Mar 2026 20:23:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199400; x=1773804200; 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=KDZZPG9DkNIoQAYC/ZQxpoKTbgw+/Pi/qUEgyBqUeUo=; b=H2caCwIBUx3EynrSdyBk3ku1RllP/8jhWzFdwCnuzVGfsVcPTXI+uq7LoHbmObD/TG 1OrZ3nYg0VlZ5hlJGKMDqwC9OB/zIRoQCZtkfstdRmnRBYg4FbH0Ec2AItOG4pi2oRel JhkZF/dq1SwPfaNhMb+TkzKdH6/l/C4vcDEMcpYNxIHYid9O3YY3PdiEjdENn76isP/6 8GhWVEnJqfFb3mM6SizpjMBdxKb1lgcn9R51Afor174BXp5n9kQ5cv/NBkD9tGugJ7FW D+krc//tMmSMXGjUoEgPqucQooYgSA6qymhlCwBD93cfp9eraQjGjQRHcZcJW9PmAE5T oo/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199400; x=1773804200; 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=KDZZPG9DkNIoQAYC/ZQxpoKTbgw+/Pi/qUEgyBqUeUo=; b=awKEuzsj5FYzvaIGIV5yBZ/wKac3X3EZvTgog5ZTLEOTLEVOlzrjLL6UfYLTlDHaIL CoBWa6zLIfCNOedgak9DxMIiA4CO+lJbH9FoeX1J+8HL6lZxZCHQcrgwCT9FSiNGcV+y KTv1/HFI8vudG6AsLD6+QWTx2SBijAgdkS/YU6oa/5cg7s8PZsU4/gREHmsnpviyYBo+ z9JgbsCVKEV7o92Ir1F0HXknLEMFd8ZbAwZG1xHdFlrpjlw+TINRp6xVaj+qw148kmsP hGjP0Z3ln8/S/mH0/UdTsMjvsvycB174kEmkW8ae3mDPKk8V4giV7wM0Nq+rRP6hJGon YH2A== X-Forwarded-Encrypted: i=1; AJvYcCVzRKw8kXoN1eH1IFsgQQ+R58wHt+LYQQ3rhPuBWzR1UgR40AAwxMSzF/oMWUEW9HwHZJBmkhlneRQO+go=@vger.kernel.org X-Gm-Message-State: AOJu0Yzq+sw9BQtKOz97/BgP9XvqLQrd9gkkdm5xXDRaI0juXG1IhAl6 wE8lBFuBU+ohdYe0Wllf6apxeZyDc09Pzg7/y4wqjlTHNJdPUZSzfxpsHJV1iG78GZh5bceF5Al 9pR4pf68RtPEhGes5L0alAsPjWshCGy4OcG1TTo63Do9SFGQYokOdWuB0yKDuEmBxy1Q= X-Gm-Gg: ATEYQzzS/jj8nsqzr6d/EEayxPfLeIc+UgaSKptxvbp2A5Md9hSGZZTlFkzMXOaBXgS sqM8ADcWOApwqKv73T3OS7SxCMJqqcivSVtyN3xfL1lE+Zu2HBGyxOccOeL8RGMxrT/NxRAeN50 8r3D+OABRbw8e3Tw5cN/8yvKGO7DXnGS4pv7QTYNkFAZ9T9mF4kk5pFPyPpf53ceZwm7FHm2LMJ iq3S01KS0DqYXggxO3PkazD85m7uAMyDAklA+zLLirEo7pG3PE7X/600Y+BWHG95Y91siOp/YtA nbv8m9dxd1d64OP5PkkIBmwZIVOWwIDaR6+0cP3KNK64wt9iICGlK7waBHKSdevO3ubn9NFQBGv ulKqUzvAItWJFPGftXbV2dvYokyLYjptZFcQQ1kbf0OHaVneKok1sq+tIfLx1L45sKeL3HAgK8y 3lJuoPNAZiL5GqHSzkOASI18rEjzCLlmEu6Kc= X-Received: by 2002:a05:6122:90b:b0:56a:fc35:9664 with SMTP id 71dfb90a1353d-56b47438bcfmr367674e0c.3.1773199400229; Tue, 10 Mar 2026 20:23:20 -0700 (PDT) X-Received: by 2002:a05:6122:90b:b0:56a:fc35:9664 with SMTP id 71dfb90a1353d-56b47438bcfmr367657e0c.3.1773199399783; Tue, 10 Mar 2026 20:23:19 -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.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:23:17 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:22:55 +0200 Subject: [PATCH v2 01/25] drm/msm/mdss: correct UBWC programming sequences 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: <20260311-ubwc-rework-v2-1-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=6916; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=uSnw+FGxAf1+lIyAZwtg2QGOswUDFmlVWOT07uiqNc4=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsOAd1kg8HBo502twDi3RMzA/fa7vBmR7TiWDW tdDAL2OdBWJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabDgHQAKCRCLPIo+Aiko 1RfVB/wKZ1nWG1/vnjr7LfDjt7Y4o1OX2kv+6lepua9Tl2OeAtNUrdsR24baxlkBg1HBphtGhgl AZbi9JTmm1fmXcNXB6GJpqPY4anViI4CKqDfXujBKKoaqf/iFHrWWXJcsDZ7TRDBdsDdiBwibSQ f12jxT3pmItf60YWGOUU3keC3V2iPl2R3sumef0nCyMHQYjtPpNxRZ22GxuRtRnZ7wBjz0laAqD sjkgjumjo8Hw4BrDIQqRoCHz28u/WFUpRnx6ZULychiDnamOxLpZ+ZcF5Ybc7w4VtN5aa9qL1x8 y2Q7++zY1H+5ivL+SOrG3t8HRg0bFRJR6V2EaSHqreIxFwpV X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: ggeW53BSPqig51fq9sLVoZ_rHfZ6FSeA X-Authority-Analysis: v=2.4 cv=D7BK6/Rj c=1 sm=1 tr=0 ts=69b0e029 cx=c_pps a=+D9SDfe9YZWTjADjLiQY5g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=EUspDBNiAAAA:8 a=hQCg4X1xv2bm5S_WMKMA:9 a=QEXdDO2ut3YA:10 a=vmgOmaN-Xu0dpDh8OwbV:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfX/iqPuceLVbRF nhFBZeEz2pPauQxJPp97yyXHVud4cSAsxfq3vt/gXHmvFRFFVQy1bGJhmDeG4lO910A6P1FAis+ kk4Hj60mVQ1dyO1ScIORGgP3dxfCRMKQrjtEoH01fCYuCH0mgtW3h9UxcUU2Hav1HvpbVEwg2+o HwASOaA42wBv3K3bSAv5OFUg4EDNkIUihggoqPMSDK/KoYNLxb0ugTc1/U5fpi7kEWNR0rdpTA5 UXQMJDEzhq1aDG5b+DAq1I8Wt14oAX/NUvnGtPS9K51leCFSYZER4/IYw5l47x8C+NBCIBOuFxR XcMK4Fjc3ZIkL2y5Snqo/3G2L1M2aTYa+yUvwhtggqUL7E/ydm4DqwnVtf6k3tZOuFGALI8Pnpm sjC2fjp5MEfcE5yjlKoLtmgB6Wsi/V9jrBwkDbK3DhUWEdu0eAzEjuLSN+juS7rv//iU+QDDOgB WkMwWWtNV4sPf5l1WgQ== X-Proofpoint-ORIG-GUID: ggeW53BSPqig51fq9sLVoZ_rHfZ6FSeA 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 suspectscore=0 phishscore=0 impostorscore=0 spamscore=0 bulkscore=0 malwarescore=0 priorityscore=1501 clxscore=1015 adultscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110026 The UBWC registers in the MDSS region are not dependent on the UBWC version (it is an invalid assumption we inherited from the vendor SDE driver). Instead they are dependent only on the MDSS core revision. Rework UBWC programming to follow MDSS revision and to use required (aka encoder) UBWC version instead of the ubwc_dec_version. Fixes: d68db6069a8e ("drm/msm/mdss: convert UBWC setup to use match data") Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/msm_mdss.c | 120 ++++++++++++++++---------------------= ---- 1 file changed, 45 insertions(+), 75 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c index 9047e8d9ee89..d8b0288f0040 100644 --- a/drivers/gpu/drm/msm/msm_mdss.c +++ b/drivers/gpu/drm/msm/msm_mdss.c @@ -166,27 +166,27 @@ static int _msm_mdss_irq_domain_add(struct msm_mdss *= msm_mdss) return 0; } =20 -static void msm_mdss_setup_ubwc_dec_20(struct msm_mdss *msm_mdss) +static void msm_mdss_4x_setup_ubwc(struct msm_mdss *msm_mdss) { const struct qcom_ubwc_cfg_data *data =3D msm_mdss->mdss_data; - u32 value =3D MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle) | + u32 value =3D MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle & 0x1) | MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit - 13); =20 - if (data->ubwc_bank_spread) - value |=3D MDSS_UBWC_STATIC_UBWC_BANK_SPREAD; - if (data->ubwc_enc_version =3D=3D UBWC_1_0) value |=3D MDSS_UBWC_STATIC_UBWC_MIN_ACC_LEN(1); =20 writel_relaxed(value, msm_mdss->mmio + REG_MDSS_UBWC_STATIC); } =20 -static void msm_mdss_setup_ubwc_dec_30(struct msm_mdss *msm_mdss) +static void msm_mdss_5x_setup_ubwc(struct msm_mdss *msm_mdss) { const struct qcom_ubwc_cfg_data *data =3D msm_mdss->mdss_data; - u32 value =3D MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle & 0x1) | + u32 value =3D MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle) | MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit - 13); =20 + if (data->ubwc_bank_spread) + value |=3D MDSS_UBWC_STATIC_UBWC_BANK_SPREAD; + if (data->macrotile_mode) value |=3D MDSS_UBWC_STATIC_MACROTILE_MODE; =20 @@ -199,11 +199,12 @@ static void msm_mdss_setup_ubwc_dec_30(struct msm_mds= s *msm_mdss) writel_relaxed(value, msm_mdss->mmio + REG_MDSS_UBWC_STATIC); } =20 -static void msm_mdss_setup_ubwc_dec_40(struct msm_mdss *msm_mdss) +static void msm_mdss_6x_setup_ubwc(struct msm_mdss *msm_mdss) { const struct qcom_ubwc_cfg_data *data =3D msm_mdss->mdss_data; u32 value =3D MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle) | MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit - 13); + u32 ver, prediction_mode; =20 if (data->ubwc_bank_spread) value |=3D MDSS_UBWC_STATIC_UBWC_BANK_SPREAD; @@ -211,45 +212,42 @@ static void msm_mdss_setup_ubwc_dec_40(struct msm_mds= s *msm_mdss) if (data->macrotile_mode) value |=3D MDSS_UBWC_STATIC_MACROTILE_MODE; =20 - writel_relaxed(value, msm_mdss->mmio + REG_MDSS_UBWC_STATIC); - - if (data->ubwc_enc_version =3D=3D UBWC_3_0) { - writel_relaxed(1, msm_mdss->mmio + REG_MDSS_UBWC_CTRL_2); - writel_relaxed(0, msm_mdss->mmio + REG_MDSS_UBWC_PREDICTION_MODE); - } else { - if (data->ubwc_dec_version =3D=3D UBWC_4_3) - writel_relaxed(3, msm_mdss->mmio + REG_MDSS_UBWC_CTRL_2); - else - writel_relaxed(2, msm_mdss->mmio + REG_MDSS_UBWC_CTRL_2); - writel_relaxed(1, msm_mdss->mmio + REG_MDSS_UBWC_PREDICTION_MODE); - } -} - -static void msm_mdss_setup_ubwc_dec_50(struct msm_mdss *msm_mdss) -{ - const struct qcom_ubwc_cfg_data *data =3D msm_mdss->mdss_data; - u32 value =3D MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle) | - MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit - 13); - - if (data->ubwc_bank_spread) - value |=3D MDSS_UBWC_STATIC_UBWC_BANK_SPREAD; - - if (data->macrotile_mode) - value |=3D MDSS_UBWC_STATIC_MACROTILE_MODE; + if (data->ubwc_enc_version =3D=3D UBWC_1_0) + value |=3D MDSS_UBWC_STATIC_UBWC_MIN_ACC_LEN(1); =20 writel_relaxed(value, msm_mdss->mmio + REG_MDSS_UBWC_STATIC); =20 - if (data->ubwc_dec_version =3D=3D UBWC_6_0) - writel_relaxed(5, msm_mdss->mmio + REG_MDSS_UBWC_CTRL_2); + if (data->ubwc_enc_version < UBWC_4_0) + prediction_mode =3D 0; else - writel_relaxed(4, msm_mdss->mmio + REG_MDSS_UBWC_CTRL_2); - - writel_relaxed(1, msm_mdss->mmio + REG_MDSS_UBWC_PREDICTION_MODE); + prediction_mode =3D 1; + + if (data->ubwc_enc_version >=3D UBWC_6_0) + ver =3D 5; + else if (data->ubwc_enc_version >=3D UBWC_5_0) + ver =3D 4; + else if (data->ubwc_enc_version >=3D UBWC_4_3) + ver =3D 3; + else if (data->ubwc_enc_version >=3D UBWC_4_0) + ver =3D 2; + else if (data->ubwc_enc_version >=3D UBWC_3_0) + ver =3D 1; + else /* UBWC 1.0 and 2.0 */ + ver =3D 0; + + writel_relaxed(ver, msm_mdss->mmio + REG_MDSS_UBWC_CTRL_2); + writel_relaxed(prediction_mode, msm_mdss->mmio + REG_MDSS_UBWC_PREDICTION= _MODE); } =20 +#define MDSS_HW_VER(major, minor, step) \ + ((((major) & 0xf) << 28) | \ + (((minor) & 0xfff) << 16) | \ + ((step) & 0xffff)) + static int msm_mdss_enable(struct msm_mdss *msm_mdss) { int ret, i; + u32 hw_rev; =20 /* * Several components have AXI clocks that can only be turned on if @@ -275,43 +273,15 @@ static int msm_mdss_enable(struct msm_mdss *msm_mdss) if (msm_mdss->is_mdp5 || !msm_mdss->mdss_data) return 0; =20 - /* - * ubwc config is part of the "mdss" region which is not accessible - * from the rest of the driver. hardcode known configurations here - * - * Decoder version can be read from the UBWC_DEC_HW_VERSION reg, - * UBWC_n and the rest of params comes from hw data. - */ - switch (msm_mdss->mdss_data->ubwc_dec_version) { - case 0: /* no UBWC */ - case UBWC_1_0: - /* do nothing */ - break; - case UBWC_2_0: - msm_mdss_setup_ubwc_dec_20(msm_mdss); - break; - case UBWC_3_0: - msm_mdss_setup_ubwc_dec_30(msm_mdss); - break; - case UBWC_4_0: - case UBWC_4_3: - msm_mdss_setup_ubwc_dec_40(msm_mdss); - break; - case UBWC_5_0: - msm_mdss_setup_ubwc_dec_50(msm_mdss); - break; - case UBWC_6_0: - msm_mdss_setup_ubwc_dec_50(msm_mdss); - break; - default: - dev_err(msm_mdss->dev, "Unsupported UBWC decoder version %x\n", - msm_mdss->mdss_data->ubwc_dec_version); - dev_err(msm_mdss->dev, "HW_REV: 0x%x\n", - readl_relaxed(msm_mdss->mmio + REG_MDSS_HW_VERSION)); - dev_err(msm_mdss->dev, "UBWC_DEC_HW_VERSION: 0x%x\n", - readl_relaxed(msm_mdss->mmio + REG_MDSS_UBWC_DEC_HW_VERSION)); - break; - } + hw_rev =3D readl_relaxed(msm_mdss->mmio + REG_MDSS_HW_VERSION); + + if (hw_rev >=3D MDSS_HW_VER(6, 0, 0)) + msm_mdss_6x_setup_ubwc(msm_mdss); + else if (hw_rev >=3D MDSS_HW_VER(5, 0, 0)) + msm_mdss_5x_setup_ubwc(msm_mdss); + else if (hw_rev >=3D MDSS_HW_VER(4, 0, 0)) + msm_mdss_4x_setup_ubwc(msm_mdss); + /* else UBWC 1.0 or none, no params to program */ =20 return ret; } --=20 2.47.3 From nobody Wed Apr 8 01:18:32 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 285DB5733E for ; Wed, 11 Mar 2026 03:23:24 +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=1773199406; cv=none; b=Nlqm1SAqMW9kfQZuk4BE1sz7c/LUXf6UFhHXSLvBvOqcXyNSUiwfWRfyIcUzT2kIWviZMK0CJbyap4V80zo3KifGobuJ3ifWMEjxfk2YDoiQCf5h45z/Y1b34UoLKDqEXSBLcmMN7+J8O+BxYvdGRu5DjffsmS1nEAB3P4Q8/qs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199406; c=relaxed/simple; bh=0jnnTKmBVzx8ajx5YR0+k88TfAux9nzkeECglU8qUoc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UeCeRBrVDI/xarOjogwz5cvuH1wsHItqXhWMEJ0zTX+RQTnryESmIz4IeWgLnpYETHSTRVlY4rH6D3e3tpcP9rXg/5sRkasgA/b5VUIkVc5Ohi40DoYSkiWebfUMH/6hMrlpfzPtomEGIVpQvqpmvsFvgmsQhWpq4ugaYQSSzek= 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=BjRrXibc; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=ZmtHGSJe; 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="BjRrXibc"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="ZmtHGSJe" 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 62AJQtAI3295836 for ; Wed, 11 Mar 2026 03:23:24 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= DhLMvVZQbF3J03WMc2id/1RoXxcDZvjE9wQx5sGd7p4=; b=BjRrXibc3zReh6gU M9oxEeQfUVKnlGgtrvw8Fk93SwXXtjmmQzw4KPIvaX7mON4GTo36rd+ibWHhMFj5 JUF5hizs9Jp3tW9jijg/K4iGV6fs/fxbAFGSQ/mwePxdCJmU8IO/MWRcGAf7+Zxe WD6K9AVa/RKBTWUSajEUcna33UkuHqnqK7Ybexi8D7qeZNpfMBeBJzNZlqHa6Z3J WLrCaurdelgGKF0/k7C/kqHzKkYpv6HiAFgAFErHMQtXpbsevUP4Oijfm4gIYeF/ HzCGY6ivoXp9tkMIfAJCg9MIISSWc7z+MYc6GOIWrJ2ZPEXwERmUD9pJeU95KHBM fZ1B/g== Received: from mail-vs1-f71.google.com (mail-vs1-f71.google.com [209.85.217.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctg1musc6-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:23:23 +0000 (GMT) Received: by mail-vs1-f71.google.com with SMTP id ada2fe7eead31-5ffb295babbso8847329137.1 for ; Tue, 10 Mar 2026 20:23:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199403; x=1773804203; 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=DhLMvVZQbF3J03WMc2id/1RoXxcDZvjE9wQx5sGd7p4=; b=ZmtHGSJeczRuxz3/pV9swILvbwmJn6D0t7+/51HMCqfoa2DzED7xYC80pNTrS2NQ/P Aa7w95W/r7FvuxldJcbxpdYilyQEKFJwxVoprKKkR3lpoKFUMXA52lbK4VMeqbbVfUQ/ 0D1t23ZcpoxSLaupez7qK22OtoA6mwPn3zde+4krNgAtL5AJkwq/pgwD5M27R0MTxX91 oGpu3z6K+8uE/iugh90FbCtf9jRRBzGydFOxwG9P8VoTfqbMDKXbPAEm/5u9VJib90xY 0xWb/tDEiZjMtGJc6+y0FgKb3f6OyYT7j6q9o4KO9LA0qrXJVsT7dE3w3IBsdT5sZXSk I5Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199403; x=1773804203; 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=DhLMvVZQbF3J03WMc2id/1RoXxcDZvjE9wQx5sGd7p4=; b=TzLuXRXEHFsCNO3E3O7bNOLoKtyGiuE0P8WMVQRudqD5R2A1u+D+MvR4IPHV5hd01T M2ZBtO7Y5WGtVRs7Iq/iMRAx8c4AjEekI/vRj2LIegZMBXB14xnFeUP/Ef2G009wD68F z0Fwl2JH47ekWlzU0T2jv+8kNCm5r0F/1nPAAFTb0dxwIbq7NZPsGBGaeYmFVDYbRHFj PBcGOLms9/wfP2Bk3/P/gUmLjQ40ZahcsS1hjDX2kSl8Zbo4jI5GtZUf/OJqM9WsYOYL Xz7bxP/32Rq/FJtu1P7njEEcncwQFPWJWtMUBE5XmycJj4oNCVkpa3gGtuk3Kt6ejvBW x89w== X-Forwarded-Encrypted: i=1; AJvYcCVKxsPnCRCpYArkVsVubbXyUP3Gj744nWukFcV6WOlolAK5wzdxXSSp+S3+XJf9deGVRDkb0tvbrx92etk=@vger.kernel.org X-Gm-Message-State: AOJu0Yx+yR+am0GsHexCkB1n8oETiEp4RlQK+BqliB3K3xqEbLa6OpDz uhvpqO+k4cWXs/18oXlVIISlbPGzaNQyikXr9scL6o4eILhYF4asBvF0LMwyvH04KPMyTn7ILfG SaAmLS5N6hU+zVgEgp9RG3/t1HQbugRU6rLyBfwr6X/TKx2kBMQ8HnLvPZXP57HcydTk= X-Gm-Gg: ATEYQzw169mnAx3ACrXhPBpSU6QszrEz7UzINydYUMpeuWiCqjfqYFJVzYHX+yl4BoC XbqgSuurJe55HRc2XPB9Lei5ucffF4RWM9Uz8ELMPE6JBMOgGgyFLMCmxlRbbQGBBVVPJq+ILf2 cG6GLWYMdEtygRplJ1w0NTpMvaCJo9iYMeuV08ATRy1oNfgIsmwfCm2L4EhDzXfyz4EDA2d4ZDn FI7B/sMee+hIuwzIznFPK9I3jtMD6AGSSCNDyIgEXmkjoL0s0gJiLZcY4zqfLZbcL9+WLYYGaLZ HbN7g6y8emMHZbUJYHpTHSmFng7Ff+x3HeD7vJyBRKA2dnn4m7JMFBxDDIY9yua/UvLjB2/ZgwP eKFodW9oupYT3ECbnZ9AHo92+x4M27TmQ615NnTOf5R2Lv7XKwRT6TEsz0RK1/KsyI6/SqhLjqK 8V11U1Qo/xV2Q4pzOrRsA+2YgkM9yQr+NdTHw= X-Received: by 2002:a05:6102:c01:b0:5ee:a12d:55b7 with SMTP id ada2fe7eead31-601defe675emr356508137.29.1773199402841; Tue, 10 Mar 2026 20:23:22 -0700 (PDT) X-Received: by 2002:a05:6102:c01:b0:5ee:a12d:55b7 with SMTP id ada2fe7eead31-601defe675emr356502137.29.1773199402448; Tue, 10 Mar 2026 20:23:22 -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.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:23:21 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:22:56 +0200 Subject: [PATCH v2 02/25] soc: qcom: ubwc: define UBWC 3.1 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: <20260311-ubwc-rework-v2-2-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, Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=914; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=0jnnTKmBVzx8ajx5YR0+k88TfAux9nzkeECglU8qUoc=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsOAdC3yGDM87kWaC0sLCL7P8YfeMzOWrmZeA2 3RrX4hptZeJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabDgHQAKCRCLPIo+Aiko 1fGFB/4mC/LJqSDDFefC/Ph3JtGVMlxhOZhgz5IX80sx0iR9aRn//xJcT4+IrLY2fJNghE18nus KD6JjdDnpVThOnCSiv9sPQcR7Q5B40iQvVgM+zw043V5m3lsZ6U83nO14I+xnGVGrju8H0OPSGa iPXFTwRh4wUN+WoeZsyXgd38ZwmD3U+pXg//FwBQ0xBMOoeQHhJ1c5Jnsp6wLrLll4JvvjH8bgg f4rKzz7FiigIZKjw5URT43ig9uen2bGU+7ewVhNBLKPQa65zfpNJfpLSOpreuHKQQGPrPVZEfHs bwidbtlo0OC7/4mWdGDl5bGe8ulHCM/TyG5s3nnvtORXOX/U X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=YOeSCBGx c=1 sm=1 tr=0 ts=69b0e02b cx=c_pps a=P2rfLEam3zuxRRdjJWA2cw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=o8D1m1ilSIXDguKSM1sA:9 a=QEXdDO2ut3YA:10 a=ODZdjJIeia2B_SHc_B0f:22 X-Proofpoint-ORIG-GUID: I7tMmp5KaxiIkH0Y5e3VkBdjJ2Mv20bk X-Proofpoint-GUID: I7tMmp5KaxiIkH0Y5e3VkBdjJ2Mv20bk X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfX98IRX/VdnpTN s5fnK16q/67O9cOWg/dzDpX722/Kt09FjdKb4f0f35FTfXjKAv9n1ceUnFJuzI0hCP2+p9TzaKf R6EARXchXF/uqZPrjZnPqSebMUUOeGSrJr7F32RGXNJts5TJ6x1qB3J4MagsIdfSpxPJPPyoFdC j/Mc2MBuBlcV2ieT1oX9FcyeHutdu+zLwyI2RDvq698tBgWp6Pfmzl9riBeREb5Q/OXlDk0RlY9 7qfLyiBFq/uKkPX/6RH/oyx+lUacFDwA/G7KOhj3w8mOHiAYWKdB7rCeyIhlU5lvbFDQW/R78wq D4BABk43PrSeiCKpkfzuRjY2ufPgtUCQV65lPizBXUMeo0lbvi3q6jmD1RqZGb959B7lioJtCyX uYiq2puSss7/LLJt+oQh0lN55iEU0MUGuJxpaZmrIUhlaTFzFA/7j0lPBnZhpccqqRa+WaoW35h Ocf5VuG34tSx8cfZ3fA== 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 impostorscore=0 clxscore=1015 spamscore=0 bulkscore=0 suspectscore=0 priorityscore=1501 malwarescore=0 phishscore=0 adultscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110026 Follow the comment for the macrotile_mode and introduce separate revision for UBWC 3.0 + 8-channel macrotiling mode. It is not used by the database (since the drivers are not yet changed to handle it yet). Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- include/linux/soc/qcom/ubwc.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/linux/soc/qcom/ubwc.h b/include/linux/soc/qcom/ubwc.h index f5d0e2341261..319caed88775 100644 --- a/include/linux/soc/qcom/ubwc.h +++ b/include/linux/soc/qcom/ubwc.h @@ -50,6 +50,7 @@ struct qcom_ubwc_cfg_data { #define UBWC_1_0 0x10000000 #define UBWC_2_0 0x20000000 #define UBWC_3_0 0x30000000 +#define UBWC_3_1 0x30010000 /* UBWC 3.0 + Macrotile mode */ #define UBWC_4_0 0x40000000 #define UBWC_4_3 0x40030000 #define UBWC_5_0 0x50000000 --=20 2.47.3 From nobody Wed Apr 8 01:18:32 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 454D133ADB3 for ; Wed, 11 Mar 2026 03:23:27 +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=1773199408; cv=none; b=rxdofsVhg7dWyuYAJKWzwgBVwDASMlSC/4fVLfQzsRQ4pmCQIMt7thFAnOd5JPzTAC2WOtxWVaS/NWe/BJWUZzNDbNmKZYmyfZGNFxGt/dee48v7Rp6h0jq5nU/iWyenFFsJZpnafSRyE+0jAM4e1ja8NJS3ZcWCfveUtVqYJkc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199408; c=relaxed/simple; bh=NJiVsMMKzJws+Cks3lRdvlT1mL0gwv+c/6r+WaGQjLw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eJoFzIb/0vK2N75yUNCpVz/hOxpvWZgfqbIz5K6I180tATLjKQHnw7wXdgQ2ZAD1mf+l8O3gPcgYiubKw3qSOygu4oZlfQ0JiU52RR7ZeyH75Up6P2RYZfphzo1MnlowkOb44LgmKrx/7KYasKgsVXVfZEBlLToFTDtRwzgR/dE= 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=eo9ERaAK; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=CMAZTrP0; 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="eo9ERaAK"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="CMAZTrP0" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62ANop5l146016 for ; Wed, 11 Mar 2026 03:23:26 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= Jnv3IJHVveO9Wr2l9i2vrKyKNiwoqkqE7X6w0Obsuxs=; b=eo9ERaAK+npHM8zl IjP3mRBBLEA9lsTTYMe8M8Fd3MKrzn5EEtC040VuRxU/wUhglUiaa2ePZXYq7SaX unThlzrc3NJfQwGLyM1lNHjXI3SRjTeRT0rAxqgRE9HITsE3OHEARLcWv6mEV8XY XxCdBLtovKnlBhgEbSRhDr6sDO0AwpYnyQRjQnI84CjZ5FdvA0KvF3vMVceesK8t 0+ZDS9L0bpSzNdE3IWp4TV3fij89TtfDQDzGqmhHagRxyljN22XMAJp+xJvKgwKF YZYgzsECTfwDoO4vavBdR89YBCkvbjTdWb8lXQ0Tgr776tXu+z42VE6GRKTYT906 Ddiwjw== Received: from mail-ua1-f71.google.com (mail-ua1-f71.google.com [209.85.222.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctwav8h4f-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:23:26 +0000 (GMT) Received: by mail-ua1-f71.google.com with SMTP id a1e0cc1a2514c-94e9a4eb3e9so3360767241.0 for ; Tue, 10 Mar 2026 20:23:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199406; x=1773804206; 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=Jnv3IJHVveO9Wr2l9i2vrKyKNiwoqkqE7X6w0Obsuxs=; b=CMAZTrP0e1s16iwDnVipYL+HKNybOwiTXoLM2CX5LD8H6cMGNUsGdw1Vwus9RFUJ5M ealVbdwv3L5f5EGV7mvKIFB/E4c8TdMWLX3l3QnKoGo9rJb+lQDzHQA5UO+VbcOEJjNF nfNWlZeDZpy/P7YzCyuHCVyd4lkzLqkEaA3sAffC5MEre2GANpekaU9UelikL39DMBWZ OG3bVzrdmCeAzdenpZmc202DIVP9CfsfAys6AVY7c3xZQsepcrzyNO+X9MIZeE4vqOwW EFYDuk/Ze+OVk5zmoK5SMQrtmgjvUOjbIT+gAIs0xZNJtUG+dZvl5m4ZQCulnlZU0D0n /enA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199406; x=1773804206; 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=Jnv3IJHVveO9Wr2l9i2vrKyKNiwoqkqE7X6w0Obsuxs=; b=DJyhXwkYBHQSvwmk/GcJa959kg+5SaWUgsP2vzes3ooUNIXUJP+2ZNaQpizNy34sN6 QbfCV2iOSanYiAqcEvrxBUpoGIG2d+mB9XOYzanT2hyV+yCANtLSbWWpKK+69dSt0n4P t/T9CVfSwI1RdedNzf9KdYWkyXL/AQCIoDv/lkUGQiJ8a7I/aAgp/CLsQRfvN6vG7gSz J0T/drMOLLmoP4S90tZWnDKFHib0Pmr6juNAokBK5tBXSDZ08X++lzcFzsOWm+vy6yJ8 nrR5dkBX81MQGQVBqBzMzVxyjcy/pwLd9f8SGqazzSWSBIBMkqCkNJXy8pEjret2eIDE iXHQ== X-Forwarded-Encrypted: i=1; AJvYcCXZxPWv3OxNcjc8BlkQVoI2nqKaB52sE85dd4JtWDKHYw8Ie5X2V4ZTmpaeltWYB+Le1txG6uz8gB9+zC0=@vger.kernel.org X-Gm-Message-State: AOJu0YwECtavd+xEpZmIOIdru9UX3/xThARn/MA5P9hCrmo9YWYmo33o OmuNJT/n+uxpuRuFwSX0vwJYD4l/gOfAu+202CumWM+UyCofJcaq+GPXALONa2OCeGjIb834jpm RNzyuY5Pe4IT6NZ9RNfjksJmdsCj73Fl1WYl0VPfmKyd2sNg63bVmoQ7MgHk1QNIrozA= X-Gm-Gg: ATEYQzy+nLc46UrqTvjlBTspUA2iOPQLxa8T9+V8l6tyWu61wOqMf+t+9b/QBXR7H4p qpZLKBfF2kjrgYzr4heFsSKYgJM1t2GtvaNNNzeQJdoEDa2U73GIdnx4pSrA1J2kJCCIYayHFpz ZUegiELYdMYIeHB9wwrLzd29E99+kK1KCZcPfJgKECb4c+C+waowK9nkCf3kvk9vOF57wTrh7W8 SeOYE0kOJR7KAX7zKrQepP1QxWHHdmy4cYCUEzAPtwAtBk8uVulwF4w+nmcrtqsGq+77svGezqT EsWRocaVX5aCIO9S45juhyO5VnVxLB0Mgz9a9QDpXA+jSRiUTYvFnSF8hkqPm0Si3z3piIFlzIG EjXti1tKqa3HLCJjNRzHe22+48EQqTmKc8/zl8vLhB+fpjho6V+8u3oOCs6HRhjQ8vMeBTUkqTA 4uTZVKnix97wnE6e0Rz0rda+olWNS3NYz8Aik= X-Received: by 2002:a67:f44a:0:b0:5ff:c24c:5a09 with SMTP id ada2fe7eead31-601deed4a4amr260406137.25.1773199405581; Tue, 10 Mar 2026 20:23:25 -0700 (PDT) X-Received: by 2002:a67:f44a:0:b0:5ff:c24c:5a09 with SMTP id ada2fe7eead31-601deed4a4amr260403137.25.1773199405080; Tue, 10 Mar 2026 20:23:25 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:23:24 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:22:57 +0200 Subject: [PATCH v2 03/25] soc: qcom: ubwc: define helper for MDSS and Adreno drivers 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: <20260311-ubwc-rework-v2-3-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, Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1061; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=NJiVsMMKzJws+Cks3lRdvlT1mL0gwv+c/6r+WaGQjLw=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsOAdm+RX1BKl9Utc9WZmugK/murlMTNVMaxQv cFLGBgSsfqJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabDgHQAKCRCLPIo+Aiko 1SHNCACU/0mPTlSy1CalUSoetffZqb95AjfoQ+qlVHfSiZCkWk7k8fXSKaws4i7tAahDqTpTmxi IDPukedlBqtQb49cJ6gskYE8kQLJI2IwZEVc4GhJyNKfOnEApyYx08hSTFJM/NQr8Hx+joM4V6T IRBm8nG2c2TLVbVhX9ybsfbsTQ4qd/k1urY8A+BVyHKUyDkmdl4njnlmm0HGOBpVBkMWBOdC4D2 o+aWx2XPRZ4GqWCoAQJyS8r6VaLpP9kRR31/N9knZm36XuQlNynoX45KR7SWYOaMYaRLBDK8lhj Qqn8eOgQJoRa6QbpYMTM0YIjETnKEtOaLrLaqT6t3iLsTCVu X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfX2xoyfc56QIPV /XasBGg4KAAKbXERTy4blKJwjt7vgtncj3Q4IIiCaIOHrF8jR84N/O2GqE//OONRzpUaUU73/UK ggrpa9aymW6exWz4BYIRMAdoIRQTkTvLJmPbLTVzF6okh1nmgyZGY+9/R92oDLs1OkshnM4YC/p 0z49pf2WMRFJMWg2pt7Cl1FsKXXjeba7Y0mNgfb4NjBE3HEUZL2KMbD42K3XmYJfQdiYTyG4ax9 wor5TskwanclHkayKIUOsE4mEvqurao8JCV43CNWJZEmczFWutciZSIRZee5/zT3Lri7xARaIzL UyHyk79DUDRHgidrS7/IumQTFqPh/7MU+ZCNVUGxHGk6wugvla9BS4anrjGEkNqFDaKqogw0xlu hTmSIZY/GHc6I/0ax+bzJ6gZnDdBj5w12B8fmDAMDKhoIt8iXasJgmU7eI79dQv9kAV4E3UrYZi Am7DpmzG/9BNfTsj2+A== X-Proofpoint-GUID: WqlboBC3iJeEe4zk2FXRmQS7T6w8NC6V X-Authority-Analysis: v=2.4 cv=K/Yv3iWI c=1 sm=1 tr=0 ts=69b0e02e cx=c_pps a=KB4UBwrhAZV1kjiGHFQexw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=EUspDBNiAAAA:8 a=TXJx5zmxIxDbTTGRO54A:9 a=QEXdDO2ut3YA:10 a=o1xkdb1NAhiiM49bd1HK:22 X-Proofpoint-ORIG-GUID: WqlboBC3iJeEe4zk2FXRmQS7T6w8NC6V 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 phishscore=0 impostorscore=0 malwarescore=0 spamscore=0 bulkscore=0 lowpriorityscore=0 suspectscore=0 adultscore=0 clxscore=1015 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110026 Define special helper returning version setting for MDSS and A8xx drivers. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- include/linux/soc/qcom/ubwc.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/linux/soc/qcom/ubwc.h b/include/linux/soc/qcom/ubwc.h index 319caed88775..8355ffe40f88 100644 --- a/include/linux/soc/qcom/ubwc.h +++ b/include/linux/soc/qcom/ubwc.h @@ -100,4 +100,20 @@ static inline u32 qcom_ubwc_swizzle(const struct qcom_= ubwc_cfg_data *cfg) return cfg->ubwc_swizzle; } =20 +static inline u32 qcom_ubwc_version_tag(const struct qcom_ubwc_cfg_data *c= fg) +{ + if (cfg->ubwc_enc_version >=3D UBWC_6_0) + return 5; + if (cfg->ubwc_enc_version >=3D UBWC_5_0) + return 4; + if (cfg->ubwc_enc_version >=3D UBWC_4_3) + return 3; + if (cfg->ubwc_enc_version >=3D UBWC_4_0) + return 2; + if (cfg->ubwc_enc_version >=3D UBWC_3_0) + return 1; + + return 0; +} + #endif /* __QCOM_UBWC_H__ */ --=20 2.47.3 From nobody Wed Apr 8 01:18:32 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 7287D35FF50 for ; Wed, 11 Mar 2026 03:23:31 +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=1773199412; cv=none; b=q0wp8QujjbfNadltlvgBkQUfk966STiviAscMHJuYp4Px8LSeXHHr9sCX0zE+FFsfDlVzxrgREZcink2n8IgPvstlPTy66R/xweZe7A/0hJKKoMAVqwt7kpsmq0SSzxRRkBjWcI62pac27Ci0UZ7uZI5X1R+QKwI8ZfMks/eN2I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199412; c=relaxed/simple; bh=gndBRl4Z4xRh4kFQivFGZ2SUW+Ocdg1Tl9bo+8948vQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SoVPnx+Bygxw8pFrgH/pqOzSFWAY1yd2j8ttK1wlmbse26YsI9LX+IjmUZ1Bt52536xk59cWdmNaa2jRpqUExJbJ+kWLJVCPXoRXB62xABk+d8p3Seqg2DZuxZiUOJDTOD1orNP2naGz6EMp6ytowrjWhyzg27RlewUhuueMMgw= 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=nKwFH+vl; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=dw/4qwXD; 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="nKwFH+vl"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="dw/4qwXD" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62B10vHB1265798 for ; Wed, 11 Mar 2026 03:23:30 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= wdo2GXNLuey4il0IRDIYFRsck7+hcgeJ1IZK0URwteg=; b=nKwFH+vllbfYavnT vcue7iBJ+ks+th6OZ8//bcv7nEaByTegBanKq+6o4KthEDP2ufz/wfl0d3fWo6ja PvLM0v2eSYy2FDbnmxgDQ6gLd2fPh5uG+Wmu09CCYbs1R8WDF6W+g8v4WTQPPHur ba1HNjVtl9xIvTUGMmAjPIla+O+BL2UPkoxoitXDosCeHXbeASvQQ4J/P77EeDbn ECl2izlZQGcgG4UWmWmVN2DV01yIrJk94eQ9KF4sCiPpAidFnANjoK2T5Rb7uNsX CPYPPApY93WVQ6eHBymo91/Akbzkdex60xGbxGLJOTxXxxliFd8xQLeheyyzlM8e po2bYg== Received: from mail-ua1-f69.google.com (mail-ua1-f69.google.com [209.85.222.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctpkfj3rm-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:23:30 +0000 (GMT) Received: by mail-ua1-f69.google.com with SMTP id a1e0cc1a2514c-9483e4a8662so19159437241.3 for ; Tue, 10 Mar 2026 20:23:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199410; x=1773804210; 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=wdo2GXNLuey4il0IRDIYFRsck7+hcgeJ1IZK0URwteg=; b=dw/4qwXDLwJdh6xU1rlY6fI2IPCfmeiMRv4gSKU4tbGt26ZiiwiyDnJDwG84wkgTat HEfkIbUwsoUDrZOqlAabAHu76xWN4JEwTHVh7WStu3EY6s+DtBW7HW4cBi2X8vC0fmU7 Tkbb//zt5548+CHylgjfq0GPW6dzeQi/zgGx/NAL6hgjPcvd/FR+7cH4+LYv+ScZudC7 LecSCyu3ggqD9sUAKoiJ7DUF2Y4BTVERFVCjPTrP84vrdQzukyiTSm+0gk3E8ceEHo/+ 1pQxT8I9nrnKA/fg0VO1qtCsng4CTQx8DkeHlsMuO+cNDzCLRHlgyHl07NRuFPte8VhH O+nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199410; x=1773804210; 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=wdo2GXNLuey4il0IRDIYFRsck7+hcgeJ1IZK0URwteg=; b=TlbSqZsOqSyj9ud2G9Ih/bJLlbuUanTeFZBEruze8IztIVqECzFTdb40uAtNBjiJZ1 9GnfK9m9lxryTFs3wlaOd53Bn8XfRjx+sSWIuL/BfobtHrXspRSClhLtKyJZIyWlbqO9 nkrEs54wc+LqiOZHrZghA5j66sxavUTBZwEWKHEh4hHujJno5CNUjcGEACEOC+M5dC39 RbDAgVGPvRuPjJHd7UtpdMwIWEUMq8UTKlSKNP9ay7D4JHSSYydfWLBfxHxwwVsWdd78 T1C0X39eUG/ZQQkyOFcH/NqZ2ismWGvUYISqKZhBy/smEgfMOX3d5VkY4b7zTey95x0Q Lv3g== X-Forwarded-Encrypted: i=1; AJvYcCVehnBmuF1KvngCdPHh44UOYFVOmEHTqHg33eh2V/soObUjqpUupSPvuydDWDyYzloGomZRblSxCdeCCOI=@vger.kernel.org X-Gm-Message-State: AOJu0YwClerwz1/KK21b3VU/zusVXHm+jhJHT22yRX/2hXl5gL610m+X W2E66KJ97rFRQ1qJFocX59MnunriNw+W0Fysf1bvGo/czSaVzWArCnK/DBAzqwe6y2G0my1CFC5 xeNShFBI9+tlCep1hLxoo1jrUxJwcZRTCqTszoHFS1mMwTI3+ODmGavhr2JrbVLY86Aw= X-Gm-Gg: ATEYQzxeZ7C7v8EUjjXREO150oxDin/27kMXtImtRlUV2SFbX0M847h2GOdVnay08zy Yr/3U7cY+aEeH7wLELVYz19gCrR5Ht5WUzKSSnUns0jC8bCShyGP2nFMP4uGUlzLHPmw1x5xfFM Xe7aFApg8pxdC4jzjhY97PzR/Xz1G4juqQnqQdAZZ8ZzCaEjtJSbVwVn9gFRRQy6GeutYwMG/m9 8U+4nDlHTZFay2RRIMHsaPDeYvvI9f4zs05Q6AByXL+PaY4GNzd5lYIw0LSlY9XdxyskmA3lNiw K0n2fbC5UMKzGWTyx9ZXDUPLSBOxCjTFbK47oAPPCMdChadFwcn7ais1twt2RTApNS6DOSYkihO rMvFexL7VGPrxBftuGHNNkFkFANkQofzSqbGLPuyfqiXa+6TUyIFI2ZWbvZNd/4gCSCargmzr4S SYKqpIaK/kMtiSCiUbbNcciPKCQEeoY9QRi5w= X-Received: by 2002:a05:6102:941:b0:5ff:ee74:dcf6 with SMTP id ada2fe7eead31-601debdc56amr339075137.14.1773199409632; Tue, 10 Mar 2026 20:23:29 -0700 (PDT) X-Received: by 2002:a05:6102:941:b0:5ff:ee74:dcf6 with SMTP id ada2fe7eead31-601debdc56amr339070137.14.1773199409153; Tue, 10 Mar 2026 20:23:29 -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.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:23:26 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:22:58 +0200 Subject: [PATCH v2 04/25] drm/msm/adreno: Trust the SSoT UBWC config 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: <20260311-ubwc-rework-v2-4-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, Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=5880; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=E5AQkqpaNuM1RXBAxJ/mn1wbVur7sOZpcfQb1l6t7DE=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsOAdXKkVPqXh0asXWed6TxjLwe0UMyOEzG3WS tjzAlBapAOJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabDgHQAKCRCLPIo+Aiko 1aTQCACBA1Khj3FuTQpAU/VWw5s+/1+5MMZddlmvBhBZ+HyJndSk3pADF6lxEGIRaN0B3MMbDZw lSalZ6dO0i8XXoHusvvtk8iELlHC+3vHIL73juAUF1AZfN5iFR6KYKhoxr0oBB789IH45iqJuL/ 3KNTjz2YhVMAZs/97pFlKYsvo06LT79+gT9lBv0jVxdqQupMRZvGlC90ZCONcoLDUr4JccE3zpf I2RmgghVer1OQjm+wwQvQp4epUqYOZ62rCXILYLfmthFzAlxHMoeBWxL+mM3dnOFmyZ3q4xCgow 3qFzNf5Xclq7vKhMT0ATxU1im6nIe2WoTCPO3BFvyGPYqVba X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: 8VAgS15Y6fWL3O6rg-1bVILvyOnkhsYj X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfXxxy3QzQPGzrX WRkrVdE5O2ycIm8GvadyyEx+MMaA+jXl/fiUIX6abk6caisi8hwpJ1yiH+38tdFk3jEPeM6UKkH eAvMusMXZZ8SJT18eBc8vtNUK5lBv8acl9oQOQsBauSANTU5/lOfmwekdy4I0puB5gkRiO9XRmL xhPMyQDtZCGOOJat4Q662zvK4GnHX4ouDtJyTF0WKkwHsXwkNOb18gKeyl7WNNmbpkWsooxY/Zr Mc9Ye5T9A7Si3VHzaipvhmpy6pWcyyxaKO6d34KU653slZitBXye/s8r2tMXC13rr2Se11bNazc Z/FXjhYk6RO1z9ExNtmjK9I15+ow0KpRWwi6kgO/EDI+19siOh3/lpq3whXUuqZHA2Xu1H3VDPv BGkA5Gnn0X1LICfuz9TUUlTyoWETUB1N+BrSq9jtf1D58gdpFhjJ+ktOXyWGUHqbX3Ey7BGE0nx ZzHvL35l1WGC3H84QTw== X-Proofpoint-ORIG-GUID: 8VAgS15Y6fWL3O6rg-1bVILvyOnkhsYj X-Authority-Analysis: v=2.4 cv=Gq5PO01C c=1 sm=1 tr=0 ts=69b0e032 cx=c_pps a=UbhLPJ621ZpgOD2l3yZY1w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=IhcC-CrlSmvFA89tYH4A:9 a=QEXdDO2ut3YA:10 a=TOPH6uDL9cOC6tEoww4z: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 suspectscore=0 malwarescore=0 bulkscore=0 lowpriorityscore=0 spamscore=0 adultscore=0 clxscore=1015 priorityscore=1501 impostorscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110026 From: Konrad Dybcio Now that the highest_bank_bit value is retrieved from the running system and the global config has been part of the tree for a couple of releases, there is no reason to keep any hardcoded values inside the GPU driver. Get rid of them. Signed-off-by: Konrad Dybcio Reviewed-by: Rob Clark Reviewed-by: Dmitry Baryshkov Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 11 ++--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 82 ++---------------------------= ---- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 5 -- 3 files changed, 6 insertions(+), 92 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a5xx_gpu.c index ef9fd6171af7..513557741677 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c @@ -1727,7 +1727,6 @@ static struct msm_gpu *a5xx_gpu_init(struct drm_devic= e *dev) struct msm_drm_private *priv =3D dev->dev_private; struct platform_device *pdev =3D priv->gpu_pdev; struct adreno_platform_config *config =3D pdev->dev.platform_data; - const struct qcom_ubwc_cfg_data *common_cfg; struct a5xx_gpu *a5xx_gpu =3D NULL; struct adreno_gpu *adreno_gpu; struct msm_gpu *gpu; @@ -1765,13 +1764,9 @@ static struct msm_gpu *a5xx_gpu_init(struct drm_devi= ce *dev) a5xx_preempt_init(gpu); =20 /* Inherit the common config and make some necessary fixups */ - common_cfg =3D qcom_ubwc_config_get_data(); - if (IS_ERR(common_cfg)) - return ERR_CAST(common_cfg); - - /* Copy the data into the internal struct to drop the const qualifier (te= mporarily) */ - adreno_gpu->_ubwc_config =3D *common_cfg; - adreno_gpu->ubwc_config =3D &adreno_gpu->_ubwc_config; + adreno_gpu->ubwc_config =3D qcom_ubwc_config_get_data(); + if (IS_ERR(adreno_gpu->ubwc_config)) + return ERR_CAST(adreno_gpu->ubwc_config); =20 adreno_gpu->uche_trap_base =3D 0x0001ffffffff0000ull; =20 diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a6xx_gpu.c index d6dfe6337bc3..6eca7888013b 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -729,82 +729,6 @@ static void a6xx_set_cp_protect(struct msm_gpu *gpu) gpu_write(gpu, REG_A6XX_CP_PROTECT(protect->count_max - 1), protect->regs= [i]); } =20 -static int a6xx_calc_ubwc_config(struct adreno_gpu *gpu) -{ - const struct qcom_ubwc_cfg_data *common_cfg; - struct qcom_ubwc_cfg_data *cfg =3D &gpu->_ubwc_config; - - /* Inherit the common config and make some necessary fixups */ - common_cfg =3D qcom_ubwc_config_get_data(); - if (IS_ERR(common_cfg)) - return PTR_ERR(common_cfg); - - /* Copy the data into the internal struct to drop the const qualifier (te= mporarily) */ - *cfg =3D *common_cfg; - - /* Use common config as is for A8x */ - if (!adreno_is_a8xx(gpu)) { - cfg->ubwc_swizzle =3D 0x6; - cfg->highest_bank_bit =3D 15; - } - - if (adreno_is_a610(gpu)) { - cfg->highest_bank_bit =3D 13; - cfg->ubwc_swizzle =3D 0x7; - } - - if (adreno_is_a612(gpu)) - cfg->highest_bank_bit =3D 14; - - if (adreno_is_a618(gpu)) - cfg->highest_bank_bit =3D 14; - - if (adreno_is_a619(gpu)) - /* TODO: Should be 14 but causes corruption at e.g. 1920x1200 on DP */ - cfg->highest_bank_bit =3D 13; - - if (adreno_is_a619_holi(gpu)) - cfg->highest_bank_bit =3D 13; - - if (adreno_is_a621(gpu)) - cfg->highest_bank_bit =3D 13; - - if (adreno_is_a623(gpu)) - cfg->highest_bank_bit =3D 16; - - if (adreno_is_a650(gpu) || - adreno_is_a660(gpu) || - adreno_is_a690(gpu) || - adreno_is_a730(gpu) || - adreno_is_a740_family(gpu)) { - /* TODO: get ddr type from bootloader and use 15 for LPDDR4 */ - cfg->highest_bank_bit =3D 16; - } - - if (adreno_is_a663(gpu)) { - cfg->highest_bank_bit =3D 13; - cfg->ubwc_swizzle =3D 0x4; - } - - if (adreno_is_7c3(gpu)) - cfg->highest_bank_bit =3D 14; - - if (adreno_is_a702(gpu)) - cfg->highest_bank_bit =3D 14; - - if (cfg->highest_bank_bit !=3D common_cfg->highest_bank_bit) - DRM_WARN_ONCE("Inconclusive highest_bank_bit value: %u (GPU) vs %u (UBWC= _CFG)\n", - cfg->highest_bank_bit, common_cfg->highest_bank_bit); - - if (cfg->ubwc_swizzle !=3D common_cfg->ubwc_swizzle) - DRM_WARN_ONCE("Inconclusive ubwc_swizzle value: %u (GPU) vs %u (UBWC_CFG= )\n", - cfg->ubwc_swizzle, common_cfg->ubwc_swizzle); - - gpu->ubwc_config =3D &gpu->_ubwc_config; - - return 0; -} - static void a6xx_set_ubwc_config(struct msm_gpu *gpu) { struct adreno_gpu *adreno_gpu =3D to_adreno_gpu(gpu); @@ -2721,10 +2645,10 @@ static struct msm_gpu *a6xx_gpu_init(struct drm_dev= ice *dev) msm_mmu_set_fault_handler(to_msm_vm(gpu->vm)->mmu, gpu, adreno_gpu->funcs->mmu_fault_handler); =20 - ret =3D a6xx_calc_ubwc_config(adreno_gpu); - if (ret) { + adreno_gpu->ubwc_config =3D qcom_ubwc_config_get_data(); + if (IS_ERR(adreno_gpu->ubwc_config)) { a6xx_destroy(&(a6xx_gpu->base.base)); - return ERR_PTR(ret); + return ERR_CAST(adreno_gpu->ubwc_config); } =20 /* Set up the preemption specific bits and pieces for each ringbuffer */ diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/= adreno/adreno_gpu.h index 1d0145f8b3ec..da9a6da7c108 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h @@ -237,12 +237,7 @@ struct adreno_gpu { /* firmware: */ const struct firmware *fw[ADRENO_FW_MAX]; =20 - /* - * The migration to the central UBWC config db is still in flight - keep - * a copy containing some local fixups until that's done. - */ const struct qcom_ubwc_cfg_data *ubwc_config; - struct qcom_ubwc_cfg_data _ubwc_config; =20 /* * Register offsets are different between some GPUs. --=20 2.47.3 From nobody Wed Apr 8 01:18:32 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 2246B35CB6B for ; Wed, 11 Mar 2026 03:23:33 +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=1773199415; cv=none; b=nCcZuyKwl8kx59jCHWxVUKwOInxMx1WZLKK66dpFNd8SKeqDjs5B/3Du1cOLlmBl/fjRZROzkt6EuMXaWKV7IJw7CeJWFcSxIBibzabjn5aPevhMzBhWecWem/GqB3PG6RU5aj6WrKpWT+qXow1doOhcCyBWjiqgZ7Tw/4EUuF4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199415; c=relaxed/simple; bh=DQjdkhkQRL9h9cv0XC/AXKUXCFPEB+rX9LBo0dUvSGs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hI6GCCkvTwjWl+rWaaGTxR0En46ucPS/XmTTbr/fKAyLNi+4z/C7sEjSAOErbHEaauo7kUw/Iqs1Av1IgM58SJ/Q0ZyizpWOVKLAdzx0wfwjbJx5zMsqwgFiyOqr9l3PDdAgGzaTEU13izOWplwEap7JvjR1CMy0lAhcmxiS9m4= 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=fXqgKjRP; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=d0ZnhCeU; 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="fXqgKjRP"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="d0ZnhCeU" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62AKv46l1863466 for ; Wed, 11 Mar 2026 03:23:33 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= sHFCV47opCKmI6D1ocvZj16p1AvAwvvCv03JYIx/BSQ=; b=fXqgKjRPT2g96Sfs PI9kT3cPX4Gb+6E7oUcXUay1CMt3ftGSTzqp4LyViJiQIKoyIRz+gDNaxfryTXPc xQtOTXQYl6JQ0+owetus342XUrGBjJg1QQH1qFgFe5O5ar8HgGR0gho4c7tJfuZk 2HUuX36NeY0Zf9aGYM3seXbpJlg3XXqjGS3GQh+q2GvR/q9ph6OVyG7AHOedJGXy b0Hf9fYKPDD5CLcjFd+9adOUAQiDUGpknarwf3SANBYsGQrn6hLT4o8hY3EgMc5M etzV3BTHbXQbkWxhSEGtSzK6kw0EGLgFf0Mw6PZkDeN/CSHZ6UQbE1JhOgkMwL0k X5dDGA== Received: from mail-ua1-f71.google.com (mail-ua1-f71.google.com [209.85.222.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctmw82k8g-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:23:33 +0000 (GMT) Received: by mail-ua1-f71.google.com with SMTP id a1e0cc1a2514c-9484dbd65a7so22558152241.1 for ; Tue, 10 Mar 2026 20:23:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199412; x=1773804212; 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=sHFCV47opCKmI6D1ocvZj16p1AvAwvvCv03JYIx/BSQ=; b=d0ZnhCeUTrURpXRNvp1eNOPJNqYlgZ5w11yXG5a1t+lR8zC0iFHqi55jT1gacmEufs G6sdqZYn14GQv+7hgER2Sqr4sZOADNdfU4zpSz+qt9gO5dOJJXOAwf/jZUFt8rYde8tP 6BStmx9R+fLdkr+cW5USMwQZEk2IEOtYDMyHDjwZu6HjqF1WySgu4VOQPoArbtWOBYPf WuSGc3bH14U+hN8kIY55ujg2H3y/baOwchzji2PNbiMhU4QyaC8Q5Hc6fGLxTtft3RZ5 qbjBLXeavJcXQbmYjbMnoEGbpoV/COvKfanYVl6zKlzKTSK3f9zgzjGO2Jd7XhyUKH8p uhFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199412; x=1773804212; 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=sHFCV47opCKmI6D1ocvZj16p1AvAwvvCv03JYIx/BSQ=; b=D/qOxskY8inQxbO52KZ0JfepG1BgTfPDfFWuLKWI8uQGgTeg7G/mGtuLaLlScsOIZx LTcoOQ7/ryZaHr3UU/+ug7MOEyrX6SGsNWv3DYkm56NpKNGZBATRib6AnmSIO9dtDFvg XWId2FeudIZIpyNbBFxHbkPLE8EfJLUwUXhk3cxQqJ05oA6f6T5WtMc/n8Kc0dqB3fCr wh5NGmoTyBYYdQzZz8qnQ0u0n2dF4ec0GtnwlPo3iUp165w5QYh3aG/6N+U8A6abVoid WVsc0zMKAwKgt416jP1zxS8PplJmDiZK6fp/pgHv7yAs+kjgLL76LdYaG37YTYBpLnnC ATuw== X-Forwarded-Encrypted: i=1; AJvYcCVYYsIiq26c5su18N0iwfDeveYIIqCdaoBOh1cTBIifkq/a5Dm60XfvjgTIevY1pOeejcyMRsQASqok870=@vger.kernel.org X-Gm-Message-State: AOJu0YwaGaTE0zj2KEqFQ7WBe9ZrnUJZZKOzLhphNqzWz4RxfGf6ZVWM H323SrkAEZz3Rc+0eKiSvPJX06QSsz6ZhzLlOOf1zkCGs8o1NAcOA3UOhH6Hl13zPIj5Z+Hgkdm yKZ9xQl+c2jMlBuZeSjmeVjLdCDr2xoteqQpg/bQWq0gXXELh737uZi6CLIOl5XwFgBU= X-Gm-Gg: ATEYQzwR+LvDJMNbW2KS/D6u9ksNgtyf+nslJFgPm8dsUnesAAB/faoz4edpGRC6BZl Hsg1zPlJ6ehMqgcT2y5I4aOIATTxiWRJPqXpMGTFeNgj7emnNueQrxSsMeqgt9FbrxQexR4gnMA tGGaF2fspl17V82edvaWgT6YILEzS4AYtRVx51wac24CGtK/N0TX7bHbpqrtEu5QjOMEpNKYaJM lrEMI00Ua4aKcClerY/ejI9weZWYcQg2B66jnBxrsCrS2uxWoAUkGnfiZOhZEGgpHrrk/WX+JeB J/b0eKpKdl84HnCOcORbAbQEg/2wcjG/0827HmnOiUWu/kZ8QgSqSH988iB3obX5cHRd12F/if1 qAFlJnRNnuwbOXYaejNSOPfy8Pw0StyLl4qRMW1C+rUUkWYKDPTO9I7vic5E6qnWQGpjzv1biZD eGo06uRKkgVEfUPn+CDzUOA0EIz2uzsBZpiY4= X-Received: by 2002:a05:6102:3f02:b0:5ff:ea33:2c0 with SMTP id ada2fe7eead31-601def8944cmr439045137.33.1773199412319; Tue, 10 Mar 2026 20:23:32 -0700 (PDT) X-Received: by 2002:a05:6102:3f02:b0:5ff:ea33:2c0 with SMTP id ada2fe7eead31-601def8944cmr439037137.33.1773199411918; Tue, 10 Mar 2026 20:23:31 -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.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:23:30 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:22:59 +0200 Subject: [PATCH v2 05/25] drm/msm/adreno: use qcom_ubwc_version_tag() helper 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: <20260311-ubwc-rework-v2-5-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, Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1565; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=DQjdkhkQRL9h9cv0XC/AXKUXCFPEB+rX9LBo0dUvSGs=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsOAdgfYeu6GQDLEeuxccJ1k6HQX8RtzGU0npY 98s/E/1KTKJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabDgHQAKCRCLPIo+Aiko 1UIaCACkHLHsytPdk4DlFH6siwOBvarPpL59dCFFX5HO2jq6Gdn72E8+dIRpPcDMqqpAR5A44Sh 55f8l8+skl4IZDAQI4t3yiIAxrtiop3WDdDR27xOIV7+FtPRjBRKnmGMx4GYRpcOVAnJ351Dv2y cpZ5eCDfVU2AK7z0WR8gxwqO/QZnMNtWpzV6pRnZYkq7MNUFAeEBv/iRlal86F1fcB/NMnZLZ8L o04ysuS5qWT+baJFgON9493TQKzXw8NNvtC7z96K42oVOzQA5W02pdMHka6LRNPlBT/W8pjr0WI kqONI03oJvq1hsx8KbUxL97kpKiJLVkx/Yf2NX9GP0GefK7o X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: C8Te5qebZMEyAxLjHTj9mkZsyULt2sr0 X-Proofpoint-GUID: C8Te5qebZMEyAxLjHTj9mkZsyULt2sr0 X-Authority-Analysis: v=2.4 cv=PJECOPqC c=1 sm=1 tr=0 ts=69b0e035 cx=c_pps a=KB4UBwrhAZV1kjiGHFQexw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=xoTxleRWwXRO4XdZWWkA:9 a=QEXdDO2ut3YA:10 a=o1xkdb1NAhiiM49bd1HK:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfXzR5oOQ7QUqG7 Xzp0G7ALy48tHixzhzvCrl7VOJUvvqxMbdlEDn9DpJ60tIaYKIhppqdQDEiK6KS8gLh7PKB1s1q 4ksIUc1QK+8CPcFDWexv4V9Kcky56vuYnZYpN7TXjC3xvrxElyeN4lXjlbeIBFUQMVBHNb/ssc4 sr/Q21x13Zqaj23slahcE21MpbO2woMs9t/fL2unLhhuvLy2zK10T7Pp+OygzTeciKP7MUfd74G EZNnALO2HPoVZmsE7nf4HBQIjcxp5yOKlxR9mlsC3ttj65q89dZ7PyMF3Nww4T9Ncr425LNVuY8 z2HLnqg2/k4zXnnW9zznVaSqMmHMdWvawBsznnPL8kgNR0S3SSVlVMxwOh+akm6oG/2y0yYTDrD bE8PJtossjHl/G6XiBtn4D/LpU/oNo/FLWUYxSBNWY6wFhLBktJBs4cWeLt0PYIMhVAxRCyrTyg AW/s8lyaU43zMXcdoew== 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 suspectscore=0 impostorscore=0 malwarescore=0 spamscore=0 phishscore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 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-2603110026 Use new helper defined to program UBWC version to the hardware. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a8xx_gpu.c index b1887e0cf698..6dc1d81fcaeb 100644 --- a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a8xx_gpu.c @@ -272,35 +272,33 @@ static void a8xx_set_ubwc_config(struct msm_gpu *gpu) bool rgb565_predicator =3D false, amsbc =3D false; bool ubwc_mode =3D qcom_ubwc_get_ubwc_mode(cfg); u32 ubwc_version =3D cfg->ubwc_enc_version; - u32 hbb, hbb_hi, hbb_lo, mode =3D 1; + u32 hbb, hbb_hi, hbb_lo, mode; u8 uavflagprd_inv =3D 2; =20 switch (ubwc_version) { case UBWC_6_0: yuvnotcomptofc =3D true; - mode =3D 5; break; case UBWC_5_0: amsbc =3D true; rgb565_predicator =3D true; - mode =3D 4; break; case UBWC_4_0: amsbc =3D true; rgb565_predicator =3D true; fp16compoptdis =3D true; rgba8888_lossless =3D true; - mode =3D 2; break; case UBWC_3_0: amsbc =3D true; - mode =3D 1; break; default: dev_err(&gpu->pdev->dev, "Unknown UBWC version: 0x%x\n", ubwc_version); break; } =20 + mode =3D qcom_ubwc_version_tag(cfg); + /* * We subtract 13 from the highest bank bit (13 is the minimum value * allowed by hw) and write the lowest two bits of the remaining value --=20 2.47.3 From nobody Wed Apr 8 01:18:32 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 912EC36EAB7 for ; Wed, 11 Mar 2026 03:23:35 +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=1773199416; cv=none; b=U3DJwmhh0khmZOMbsvmOD+sd8wx1yDGATdznE/eGNP0paOLIhIi8mUmcv8pzp0v+97put6UIt/nyRoWTvnjbRmqDdMF0B/fXQA1v8ApT3U+4VqRemyNes99ffvGK67bcjg+levan59wsj8p2WYJUY19E0CUjsrZKSTjeh9hOfcs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199416; c=relaxed/simple; bh=wXJJ0dAZpKF1rU+9v2j++kD4vXhMZtkbkrtjqNCMm+I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HonPE+UajK/WfFU07sj9F53XbR9cVCZt8T0YLdiwTiAACRM/9h/lOm1LzunWExXh0SbeHvDoSObyHfQ01jrbmLf2j2dLlVT4sjhFrOFIjx9PExSpAaGICIkpnWJ2DfDWWKLhcmgjBTCur883bQFKs93J4m5TcAZj1k0QWAtXWas= 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=NiwBQHBf; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=hajwiR7T; 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="NiwBQHBf"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="hajwiR7T" 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 62AJODID3417778 for ; Wed, 11 Mar 2026 03:23:34 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-ua1-f70.google.com (mail-ua1-f70.google.com [209.85.222.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctja2b61d-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:23:34 +0000 (GMT) Received: by mail-ua1-f70.google.com with SMTP id a1e0cc1a2514c-94e99ef0150so5047426241.1 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=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=nJxnxNjXEHAomyQpf6dxP3G900o6a7htory/+Plg2ys=; b=hajwiR7TvdfKqhmLvQOfhN0anweM9AelUOkzTvcBh5CNwZQirvVh2kny7+aAxQPcL1 1XG6JFLAReFhNN/kSlLrc7IIuiCMivfoYe7UIqNk/aZBpqqSD/Ub1fFYe3aq1DDkBD/F OvQIgCBAIw4gsnh4v96mcFHpo50beUp50SnPUsRhxFQ8LPzum92XnQHK6UTDxc7L9JpN iVSahrPz9ykZHxj7rwfk1p5zLYEhJaEAbhsx3s5TwPojd7IHbw9O6eoi6eNRpG4H++qV MqzsuOrQv8tXWL58jAMGq05otrMXjEeYXLuIxy+/Flq+eyZ5Noaol/sflhU7JLdMpgqu xttA== 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=qfWjXEv/D6kYr16GrYE4JG91JNGLaOP5lJmEtNMPiZeBHSyD0c1fgODHRbTBSpePsI 934HiVbMcHuXvwLNs+e4vXxqM6PqJJ/330lNg5yhJunzFAkXAlHWg0FtP1Z4vl4mLdyz Vqrxq/HJJ1kdzilBT4v/mK5Y8yt2TbxEHKMfu/x62Mrnf4udeSXtIOuToaqBN60wmZHO 79oU6pU2fvU8HvPDUQhK3/N3Pg6GDoRDj7cydjuw7QNZzsymGe5pq7E5w92p8biRY74d JEDigipq+sYoD6kVKJQlKDobhjet0biZi7HyDzb3QF4iiwsroP5uBA5AyfTST6lVoiUZ AmmA== X-Forwarded-Encrypted: i=1; AJvYcCUrqq4aybYooiFNDONA5NAbw/UE9weZCrGjG1jrQW+j33flqwBKY5FQoRqaWNsjlEQTklLwA7F+oVsl/8M=@vger.kernel.org X-Gm-Message-State: AOJu0YxV5Q19EvzeCHMp4cagLuH2YeDa9GrkSTinEIm8CT4dF2jMU/l5 0qY/7hQ4W1bBx7NPFXEFzHET/wuGcAd1BE1q212minD7x+2nY/Vp/e0FagG/XjNfQDGDjYjBd69 E7XQNbzrl3gm2ShnoHVFK9q8gQpAJ6BqQDxzRpYP2RZXV5P7zrjlBuCSr4gQ+TUR7ACg= X-Gm-Gg: ATEYQzwf0gDRJfWyNXoPSWg0MSpP4w7/+cebytpGlpJ69CTszCb9rvu6hKoh5MNL6jZ RwiUWXmF3p2oDRkoS4J/XuBw+kbEDDftoYVcQjYDQFs5OSm3dKDBejhuKcLx/QBV8eKrjzzyVS0 3e4S8X7h0XjIuEsL6Mt8Oo4hzFLxgyYi2S8uUoXKg8VvZEEgoJRjoESzy+9onWoziIrYI82vi++ 5wRxKgYX0FpM4UY80InwAVACUPbKdJf+KnKEoOEEfoTfLPnWfz1xZfHEow9gyon9frrEWvLKSWU mqVX9gqDhVH/KRSWSodKZAQc6fDM3SPj07pGsGWUwy1fXW8jyRwWGG+gCXooc2w0IxYU/bsIMBx 5RB4coKJrRCWTqLatzMm7o2iv0bL5hRIUff/UOvfe3+KUYZrSZCqP5IFoJQBPtWMAThmuA1swYH YK52XOh6Gbyccm67Z6eygfBkt3nMzeLTu1PwI= X-Received: by 2002:a05:6102:50a4:b0:5fa:603:1d62 with SMTP id ada2fe7eead31-601deb9bf32mr368668137.14.1773199413764; 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 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: <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-Authority-Analysis: v=2.4 cv=c9WmgB9l c=1 sm=1 tr=0 ts=69b0e036 cx=c_pps a=R6oCqFB+Yf/t2GF8e0/dFg==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=Xd8vOn4_dRUKSRNknbIA:9 a=QEXdDO2ut3YA:10 a=TD8TdBvy0hsOASGTdmB-:22 X-Proofpoint-ORIG-GUID: tynO4Fz1icWMSu17szBztXnX5r73hesL X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfXxgamIx5ElMt6 tzx02R5ZfHBpOcIvnPfVIDkcF+pWg6jvA56EEeCBp7owHDDUYior5DdF8RLfwnxJFrRpNfP0Hvl lrndVpas9XXGYReiP+O1cWMqT72S0KGKCotuK6Tveattqk3cv8XHBpPWBRIFcsOyNRUyWk3gkr2 1mKlHUiRhpGKp2G+oSj//subQpxTmtAOiRsNhgCYaczc/4qRnEsDlWDvWa+yYkvK1g41hgtcCrR 67O2PrXgkUdSaJWYqEV3s8K8fd2NMAWJ88aBeog/Ff+Kr6ixHL15jt40gWcshu3YvAdySW88nw3 LPkLMTAGbEF/iYwMM1Du/JE+kDeInMNVjIckx7109wg/aDp02nbP8I3YCsO949gJZHX2bYEgQcq m0cCKSpLB8KS46lnXYKyntbIK0SUxFwbrEoAvY++Z7VJU973MGte+g0lcS1/EoU/HPKD1uyJoMW 8VuFbWgpVRaNy5VIPyg== X-Proofpoint-GUID: tynO4Fz1icWMSu17szBztXnX5r73hesL 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 adultscore=0 malwarescore=0 lowpriorityscore=0 suspectscore=0 spamscore=0 clxscore=1015 impostorscore=0 phishscore=0 bulkscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110026 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 =3D msm_mdss->mdss_data; u32 value =3D 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; =20 if (data->ubwc_bank_spread) value |=3D MDSS_UBWC_STATIC_UBWC_BANK_SPREAD; @@ -222,20 +222,8 @@ static void msm_mdss_6x_setup_ubwc(struct msm_mdss *ms= m_mdss) else prediction_mode =3D 1; =20 - if (data->ubwc_enc_version >=3D UBWC_6_0) - ver =3D 5; - else if (data->ubwc_enc_version >=3D UBWC_5_0) - ver =3D 4; - else if (data->ubwc_enc_version >=3D UBWC_4_3) - ver =3D 3; - else if (data->ubwc_enc_version >=3D UBWC_4_0) - ver =3D 2; - else if (data->ubwc_enc_version >=3D UBWC_3_0) - ver =3D 1; - else /* UBWC 1.0 and 2.0 */ - ver =3D 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); } =20 --=20 2.47.3 From nobody Wed Apr 8 01:18:32 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 3B62A371055 for ; Wed, 11 Mar 2026 03:23:39 +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=1773199420; cv=none; b=WTH4uPiLSC1iFSq71XTa1rmsQYjHIONlWD0l+TLyU4F+7FcNSTo9AWE9ueK1pB0aymhr3S2aBS1jCOQf/mJnBfttkggcNpqGU+NS9E8/dKBXl3Uy6IY5wEqcuG65XpE/71LWUW5uZl1G9sdr7qHDYoI5kxSG0skI9m2jRJxhb5o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199420; c=relaxed/simple; bh=vcRHbEAGLYLgXe4iaZftIzhetGkuS44tvnfyt/ZXY1c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kq+qK10PXuCOZ7DEsjBk9W8NbAB9+93JUuldDF+5RW25+7kmuDr3hu6ttJpk883zcbUGQmRZrXz7oIMi7mtijeELqrEcnZguvj8m/nveSvWxdB1DMQbTxanvwaxYvDyy/QtNhOtR4WibVc0TCmrZtLlGdEZZOeqbFU+vILPCxfU= 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=cgNMVsZx; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=F33Z/5rL; 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="cgNMVsZx"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="F33Z/5rL" 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 62B2Kj9L248813 for ; Wed, 11 Mar 2026 03:23:38 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= tABjXUq/OjxQFlltJI7qwEI7Ulj0yf3Q34M6i0RzZsQ=; b=cgNMVsZxErBUR+FZ T+qVtr9b1dx2619MlUbmEGH719FcC3bq4a7gXH/wghH2uqcnucunxcL5FQBj85uj qt5VCGLaj5pFGn8oSc+zw1txQNzJR3hnuVRQCsgne79V54Ht5sdkwk8xChgOk5a8 5HqAltakLkzPXQiWfY7CdevljZHAhD1QPuG8hyNiYivDGDUgsc9nHTeI2kwTR3b1 DO7BBDNvefVyE7XtZ8Q7fUfWsVH0L60GG5hOullhyYvq8FgWxlPBfVpsNNRbtUoM 3w4Rqr+ulovv2HFoeC7ejdoD9JjhVRkPZ4HedC3/8VAe9yM2+B9VcTjM/w+mY6AM jEPi6Q== 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 4ctqv11nv5-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:23:38 +0000 (GMT) Received: by mail-vs1-f70.google.com with SMTP id ada2fe7eead31-5ffbbf0e3easo7445676137.2 for ; Tue, 10 Mar 2026 20:23:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199417; x=1773804217; 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=tABjXUq/OjxQFlltJI7qwEI7Ulj0yf3Q34M6i0RzZsQ=; b=F33Z/5rLo9SpIeCX7AJAJVTrTceSG7KUF8GUcbiYuJ2A1s0TksS6VNaOtqrZ3hqw4v o9Agrf5QqmWxVhBSzTS4uQJcWxbdFc0colF1t4ZMb8+sD8G9huXDl4VY2LRC6juLYgCu 7ic1VVwSsdHhlBhtDH7RDXunSEoKSEV4XxwSk8ukEagmt4hvbTlsPBjnVEWN+xNxhT3v vNPOXOXBLNJ0CSU1MMn+XAsNKKpX1f/bnUkfzTYxazPHpa7NgNzyetkh7pxSGdeiH0+U w2gHoWbH057Z9Deni535rwiWHFO8G0GY9x4+5E+sEopzzNdXGjd40MiFLEF/z56O9ev/ DUBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199417; x=1773804217; 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=tABjXUq/OjxQFlltJI7qwEI7Ulj0yf3Q34M6i0RzZsQ=; b=hP6RA1u+oBg48rrjXkT0ag4Bptdd95+TEsy21qHyKftqT17fJ0/A8GOaqqjBTZ/1M8 riAOBjSqb49voZaNRGvzj8quL5rgSFBBXB7yq8yIgxMMsQXXr8JP7q4DtSrqdzNaXjcy SypYWPSstvftnBECUSpdep67f7ioVd+sMXOESskg7oJPM7p8l7AD0to1ltijKQnwqU5j BGIQUDhpNVx6r8XUiwDzHQ85wkmSBcsZTqmmz5HgcN7BJRaM8SKv1b//6UpIYnjL5Bys E4RCSZFsyBU3cOH5mRRnOv49hulIAIlYaFCP+DO718CAJjnYSEay1zMZs6uc9TMyt1aa W9wg== X-Forwarded-Encrypted: i=1; AJvYcCVmknx6HemvSSUmOvEfKMOLsxJbcDW/G6kMon0qn7wiBWBezKQLn2tLyDDBqKP4Sj+h//EwYTa2eBa/Qps=@vger.kernel.org X-Gm-Message-State: AOJu0Yzs/lAwwX6I6cT+QViddczlhGa4CgAQDK9cGKzwvKfga7zqwJlD c4ycFFE3UFTRdV6VoElGwT5QiNxhu+ZcTseqyzlZaW8xCy9tmghsfrSNOn8P7mOIDG2TU7yVzIo 13SbYR1Nmds6E5VkIG6loGz4gUisZmGfQgGXscSJgYh9BeFUR1MprTsb3dMP2AHQ8Zls4xvEoSH Q= X-Gm-Gg: ATEYQzy9TgAJde0MEXN3Pik7iHE8CeXPKLRCmuC/gXw/++TfKPrUhndBpBnU7ircDVs wsU+jozlfu8IxWMxbuf7fA04/PsID08CTWBbf8/t77+Kxl4dCmCGC8KL6B3YBfgcX8HryPEqWEB 36jpw6vP1eb9MwSkVbSOUgJr/N4odvUO6Wj1qTnTV/pJw1L/KyX4NaVoUjPOL6O6YdHjVIhs1wE aMyR9N8WxIpn+nLBc/1qVKYq47ElRq/80MRsbexIgmuomibsqTWhAWg9swr+L7xl00dbLcggVpg O7qUaMjqQSgco8kQLcz7dpqhPYsNrHbOx9K1qDPsxu9g282H81xoHq3sI63Fsfu71KQ14Ez1HIR EgKVpMYePHiJVJCkLvZ+CPs5NlrqwoW5p2tHdhJkceZXpLKq2Z2Mbmq4NZfIJiEShKXJDuqdmfO 6cSi5Js6OesQnDJjYksJpiVLiUpcQ0vYPD7jw= X-Received: by 2002:a05:6102:5491:b0:5fd:f8d6:e5d3 with SMTP id ada2fe7eead31-601deb93545mr402764137.10.1773199416514; Tue, 10 Mar 2026 20:23:36 -0700 (PDT) X-Received: by 2002:a05:6102:5491:b0:5fd:f8d6:e5d3 with SMTP id ada2fe7eead31-601deb93545mr402760137.10.1773199416080; Tue, 10 Mar 2026 20:23:36 -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.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:23:33 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:23:01 +0200 Subject: [PATCH v2 07/25] drm/msm/adreno: use new helper to set min_acc length 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: <20260311-ubwc-rework-v2-7-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, Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1349; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=vcRHbEAGLYLgXe4iaZftIzhetGkuS44tvnfyt/ZXY1c=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsOAeO4nElIJcpuyqbvQC62M0/OONI27Dtl7Qg uWcvp4x3wqJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabDgHgAKCRCLPIo+Aiko 1X0kB/wJwyuj+XLI2LEBuuKOWUFkxdi8dLenQPx9p5GvUg/qDaDdI3lJrLI0e6dSH/jM7X43NqF vp97cFEvLGZdiP3JIxQWRXV2Vx2mfcZFE2kVgMAnTrq+OfY+8JohGMZkZjYr/L9djyw8E1rdKlw yOSoBZswqU9MR5MQClsZ3qzhz3EmHuxs4D5M8X8ns76JoRBasuj31BzzW3Fwc6O3oH4N0k8gvLv 81GxHCtnumJZl6va1/kqsxDwY+ZnfwAxOg93USVQ9uBO6gHK1Feq7AP/PXU0fNSt0g4Hv5KY5bn 5S9ZAOi7sOp/QBdnF5CKnUZFeckHk5s8kT+I4m++nWpdeefC X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfX/LbALfKHg/4x omF3PwV8/ZieQ9hvJFD0o2WV0Rf0zjmkqvcGQJGAiYGJgNgpDcE9dL8mU1jqBQvyqujT1ppXOl7 KlJ25oSUWhcuHyWs0/WAqr1mOhkQRrd/5uFwPbspHQ38H+mgsKgslvP2wo9sDVsAYrnxybCvIgG 3WmHTY/tuGHXx+/c8X1VbluIH8IB7MWochq89Bi/kREsIAux3fqicqnWCqTwrnxpOBXXxnAvLMR S0Dtw4cXUsALpkNIi+1FOzJ6kP/oia3DfOv4My7fadOsnB6jZ5pJhEsMwobV+RS1OF6ZGT2hK3/ BRzt9nTg+ztPbSUBVk5+Q1UKIk4m0MkRXLxNd5DBgQ3hrCi46D2mBrd2O2brQIIFwKYHfwXFzin EqLI0jPj9SOu/16UwSGW6jPmnzRef3SQ5cFjJMU+sDwoAPJ2r6A3IvT5ihEz8EyUkGXctqeLiZn dNEVNmC38MsdlAMxIPw== X-Proofpoint-GUID: FaPua49to9CtWrFS7fNNT_QQ0gMS7CK8 X-Authority-Analysis: v=2.4 cv=S5vUAYsP c=1 sm=1 tr=0 ts=69b0e03a 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=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=X-e67srwgh_QgMMAbO4A:9 a=QEXdDO2ut3YA:10 a=crWF4MFLhNY0qMRaF8an:22 X-Proofpoint-ORIG-GUID: FaPua49to9CtWrFS7fNNT_QQ0gMS7CK8 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 phishscore=0 impostorscore=0 lowpriorityscore=0 clxscore=1015 suspectscore=0 malwarescore=0 adultscore=0 bulkscore=0 spamscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110026 Use freshly defined helper instead of hardcoding the checks in the driver. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a6xx_gpu.c index 6eca7888013b..2027e479d5b1 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -744,7 +744,7 @@ static void a6xx_set_ubwc_config(struct msm_gpu *gpu) u32 level2_swizzling_dis =3D !(cfg->ubwc_swizzle & UBWC_SWIZZLE_ENABLE_LV= L2); bool ubwc_mode =3D qcom_ubwc_get_ubwc_mode(cfg); bool amsbc =3D cfg->ubwc_enc_version >=3D UBWC_3_0; - bool min_acc_len_64b =3D false; + bool min_acc_len_64b; u8 uavflagprd_inv =3D 0; u32 hbb_hi =3D hbb >> 2; u32 hbb_lo =3D hbb & 3; @@ -752,8 +752,7 @@ static void a6xx_set_ubwc_config(struct msm_gpu *gpu) if (adreno_is_a650_family(adreno_gpu) || adreno_is_a7xx(adreno_gpu)) uavflagprd_inv =3D 2; =20 - if (adreno_is_a610(adreno_gpu) || adreno_is_a702(adreno_gpu)) - min_acc_len_64b =3D true; + min_acc_len_64b =3D qcom_ubwc_min_acc_length_64b(cfg); =20 gpu_write(gpu, REG_A6XX_RB_NC_MODE_CNTL, level2_swizzling_dis << 12 | --=20 2.47.3 From nobody Wed Apr 8 01:18:32 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 E51D936EA9D for ; Wed, 11 Mar 2026 03:23:40 +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=1773199426; cv=none; b=ChsECs6CeDGyW5vxT+HMtPnOnFLvs6EdYidCXfYs51dc3LXrD0giZtLxy+uzOVoXfk+b3bGBA9+c85H0X45TAC9n/wxRKihwK8vPiskbc8JJ8pOOtPw3gPY4Cvu3alPYMQpUrdzrJgsqXKelKV4I6ss36k1pGFMV6rRSXIAQT7M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199426; c=relaxed/simple; bh=Mo2e5asKPI5xpZsCjnNf0ROQpEF4U0WKdwGGP3IBoTc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RmHeKORpFdMLoZgmtx8AEkvXYOEDyGcp91mkpIm80JUFcpq25X9yB2G6Eab+mgoKGM7X0YOyjviF4iU8LaHv5YjbF6g/Te18DvETi5tDDwL/Nae/+GijC9XBRPiJPoFatv9IGNvzbKxgGC0nTNDxa8nz+1ZKMAfV6r6nOnz27oM= 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=ktVzbtwt; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=R+FIKlJ9; 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="ktVzbtwt"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="R+FIKlJ9" 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 62AJ00ep3417107 for ; Wed, 11 Mar 2026 03:23:40 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= uPjlYcDhTlo5kJobBmeD1ArJXAfI/y95Lr5sjDuhNbk=; b=ktVzbtwtF7q2sBan 9EdHyU1rhjDMZlha42Z0+SV+I/VvkRH37rUhoOtfb0WO6J1FEq0dsuZrgkxtXReY UZV5dd2RGM534YCuKYcNtGnDGzh++gMVJt8m1kyqab0LbJItggR+Lx+1AH+6yaxb S/L9O7VEU9t5gSl2gUYK3IpM9hQfpO4BlUQ+3RKgz1tUMhOxZm226XKg41j7vFy1 eKTueA+Lol4Di5lhe8obyjan0TX3aD9RVqzszIAvdkMv3omCDWXifaYckGlX+8UR yt6AkTDtG7qzo/RBx/tzPxXd9nyAtTGOf9DdW4AH4j+gOmxqYQ00wNekZXIBEeTn 8lKeew== Received: from mail-ua1-f70.google.com (mail-ua1-f70.google.com [209.85.222.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctja2b61q-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:23:39 +0000 (GMT) Received: by mail-ua1-f70.google.com with SMTP id a1e0cc1a2514c-94e4b6c8cd5so12495299241.2 for ; Tue, 10 Mar 2026 20:23:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199419; x=1773804219; 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=uPjlYcDhTlo5kJobBmeD1ArJXAfI/y95Lr5sjDuhNbk=; b=R+FIKlJ9fOCEDbCoa9Uwv5NtGdtiCXpm9GVqeOzkZRlCrPjYmk8rYgsHiN4aVYbGlV Nxp29v1sYakPYQYeXp6KGvVULLK5FYADqZ20Zngpb0gxLZR1k574IVdv6Q26yphHX701 y5LtIc+tZUWIqVsE5MLcRO0FlAxrLpVXjdg6BQuoTQ8QLPXb1zMxuC2HLYa9FNWwTXWH nTykD4Kgq99FB+0kXWoxg2CHIusF67oq9VTYmkqox6hrUvL042hDHQ77URJFjL2FH1YO CpPEUwlhMUp+bE4EvIIUDg6cM6EcHHlKf315FPp4lM04x95gSZmpw0z35Y0WSgEjE4v4 Mjiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199419; x=1773804219; 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=uPjlYcDhTlo5kJobBmeD1ArJXAfI/y95Lr5sjDuhNbk=; b=Uwa+dGeHsEt4B4/65/ryRw8Ftuol1xZReZ/xo8ikTIyKsI/ez/Eh+n+tp8C1l5nc0m ylaHZC/MVyXwwqelpxhMAGkkHx1amjn00GIL1M8v6B5r2WCs19yzRH8jYzkeMuoQcs+5 TaTuZUavar5AiKGTFX/DJpIIhBS7UTxb4ZgOXef+NvPPmDhk4Y71hw3Yj7B4gJkqkkhY NhnaMvspkAzzcYuLhhg+lsyaHiomwSJDeaKAxDcTHVpVRJDCbkIfXiR7/07M0XlNEyVT nV/7oS75H41JCB7Sdhwyr27EIgnl7150SGrb1zOnv4OmVCSlPss9btv0wt05VOczplRQ mAyg== X-Forwarded-Encrypted: i=1; AJvYcCUJ4z8FvJH40jiHWcjGwliCu4yOACmQ6bGGBS8A5WDyx0SFIHBG/WdjluYv8R8r5ch+uwhyanSxYCHpDuY=@vger.kernel.org X-Gm-Message-State: AOJu0Yyg5YO21q7ePwOP60V98lDARhFtUuNDdaHsGKtLy9gGgE8nM9sL cI+07DGYP17pu2mP3C1djZvCU50s1g6CJBkVamhq7biIZOYII7yPr0aAzBxZhiG3hQWyyGjq5df L3mKgK84aRdoXhW4Hc7TP6gQAfzuoS8iS0spt6IPG0EatY4BBoDdfbzKr8rfTzcvj78g= X-Gm-Gg: ATEYQzzDahdajzZCjfyj5IH5L/5w1mkXfFz4gdunwGSG3UvEYmXERVeV0KPhz1OBfLk fNfB86j9h+gMfsqyZvqCTyqea7L7U9mN2s7k7NDCsdHlkAnTYeewwXanDniglto05Ql2wklXm0/ qEkfBptorHCqc9Gqk6ObIRDNoNoYT2U9auJ7eX//JbY4qtfSDQtqi/E6jjWAmcRZKbO3P6Dvn3x SXk1iFNQNlU9wKULZGe53xdjMdwSByrlV88w6gNLOB3klCKw6tNUMR2NqZsBIjMQr2EkrDYRfH3 c4bn20B319dZo8O78IoD7X7xjD8/TX5YCwrtuLKOKIyWLz2ejm6+VDI1n0GeNeYpMJbSKRDb7SU B9G5OZ9hk2uST/T8/VT4VLxRc6k0KthaHc34w1PqcLV59RidhWYj3geHA3ds+Fu/CrRMptP8rai wdWLsKPs9ThG9PN/WZ+UBxhFr6tuA/R3NpgQ8= X-Received: by 2002:a05:6102:dc8:b0:5ff:172c:2d96 with SMTP id ada2fe7eead31-601deb20514mr426644137.3.1773199419219; Tue, 10 Mar 2026 20:23:39 -0700 (PDT) X-Received: by 2002:a05:6102:dc8:b0:5ff:172c:2d96 with SMTP id ada2fe7eead31-601deb20514mr426628137.3.1773199418778; Tue, 10 Mar 2026 20:23:38 -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.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:23:36 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:23:02 +0200 Subject: [PATCH v2 08/25] drm/msm/mdss: use new helper to set min_acc length 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: <20260311-ubwc-rework-v2-8-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, Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1420; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=Mo2e5asKPI5xpZsCjnNf0ROQpEF4U0WKdwGGP3IBoTc=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsOAe5uYcfbPSgL2H//BPLqal0DXFxZ43VPoW5 a8Tb4BB9rOJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabDgHgAKCRCLPIo+Aiko 1XCcCACKtqmULG8LMHRj/2pUtR2naMjTqEtRo0nHjZ21AchJ5RiEStTNpjUq4XT8Cq8JBxhmbnz EifCb6Zt+K4E+rFIGvAInS1QYyNu/tSRULdkMPBWPD/mwjHScGAasPBcgPQ2wkBy6xUpvO16dch HRebfaYz4AFZWxnQ8OkTOyDiZTzYnoKDNSbp90ssQXzl2dF2/Lp0XNTJpXtYk7Qw9D4CK+vSHlt bWZQqwZPoQCVKRXt7RnLcwWL0aqU7PVGgF2cE7gfKu2mdew7XmDzUt11b5O3LOCieGpMgH7Buzp YQ3W1CJPvxx9OvCM9fCqL5zzMy2Jb/tajk8cQaDk3R9DwNw+ X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=c9WmgB9l c=1 sm=1 tr=0 ts=69b0e03b cx=c_pps a=R6oCqFB+Yf/t2GF8e0/dFg==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=pH-95HYbptEkGMIaxFMA:9 a=QEXdDO2ut3YA:10 a=TD8TdBvy0hsOASGTdmB-:22 X-Proofpoint-ORIG-GUID: ZatYmy71MBZSzHG0-2x0NiGRXKMI3gcN X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfX/QxhWin+DM7K 47NunRkVv78pMITKU7++ku3Xk9/La0bI3QxS7yyz+05xjm7DoaY9zXu4DeiaTVTMOckBMKzTodk 7GMaat02/PQWXVb6nWrT7CMSxqsU2TX3oj9rA9z24FejpGc0EejpX7RT+nkFkhZAISHrDp6mjbH +fAQ++1vZ80ehDVIUtnpgb6Vhpbi4MRboWd6RywJaJ4FKWEhDWLRwGXQlCDbYHsiZtEl1tseMkI O75u8LZ4Kk+rmmrmBYFsxog3WtDPZYBCoEetAtrFLXNAZeptnWCFASmwnObuX/wtUk9j3Q4zCPY 8Fg7R9CUgTdEomi2ARRFRbQcUF8Eqfo16mH9Y3deEORBCS209Lbskdehe5MIfpY4Y0lSTQHNCp+ t3NnWPiA55k/gxfnOfXwjCtuzQT9ETs5bMb/MzoFnGpF4EYVK4x7dSLefJhq3Dp9ARQ+490A5FO ujJaabHYW5wMsEKRnAg== X-Proofpoint-GUID: ZatYmy71MBZSzHG0-2x0NiGRXKMI3gcN 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 adultscore=0 malwarescore=0 lowpriorityscore=0 suspectscore=0 spamscore=0 clxscore=1015 impostorscore=0 phishscore=0 bulkscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110026 Use freshly defined helper instead of hardcoding the checks in the driver. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/msm_mdss.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c index 497db0ce28bd..49ad1a9bac23 100644 --- a/drivers/gpu/drm/msm/msm_mdss.c +++ b/drivers/gpu/drm/msm/msm_mdss.c @@ -172,8 +172,7 @@ static void msm_mdss_4x_setup_ubwc(struct msm_mdss *msm= _mdss) u32 value =3D MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle & 0x1) | MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit - 13); =20 - if (data->ubwc_enc_version =3D=3D UBWC_1_0) - value |=3D MDSS_UBWC_STATIC_UBWC_MIN_ACC_LEN(1); + value |=3D MDSS_UBWC_STATIC_UBWC_MIN_ACC_LEN(qcom_ubwc_min_acc_length_64b= (data)); =20 writel_relaxed(value, msm_mdss->mmio + REG_MDSS_UBWC_STATIC); } @@ -193,8 +192,7 @@ static void msm_mdss_5x_setup_ubwc(struct msm_mdss *msm= _mdss) if (data->ubwc_enc_version =3D=3D UBWC_3_0) value |=3D MDSS_UBWC_STATIC_UBWC_AMSBC; =20 - if (data->ubwc_enc_version =3D=3D UBWC_1_0) - value |=3D MDSS_UBWC_STATIC_UBWC_MIN_ACC_LEN(1); + value |=3D MDSS_UBWC_STATIC_UBWC_MIN_ACC_LEN(qcom_ubwc_min_acc_length_64b= (data)); =20 writel_relaxed(value, msm_mdss->mmio + REG_MDSS_UBWC_STATIC); } --=20 2.47.3 From nobody Wed Apr 8 01:18:32 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 67DEE3290C9 for ; Wed, 11 Mar 2026 03:23:42 +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=1773199426; cv=none; b=J1kEwlbZ+uwux0mJZO1Qxwl5n/e/DH9N0FObOXscmkWhJFgC/o5tssv5EOCzSy3PBey8ngo9viDPDKeMnBMXn0w4nY5SIJNSc0oMwuOwjKVPO0TopNgKF8LGrdrv6nU8OxrphxBwOIouEPw7F+JwiqqRQq69uZQlgcGXfST+GiE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199426; c=relaxed/simple; bh=2pmZHdByL6nsS8Ik/InzKdBxSCO/78Oop/N0tOJ6bIw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=E5c6DDzRg2goNLd5TGFgn06Umo7VkwvzLr80Z9EbJyVr1xnpFl6tShVn9n5n90eCp3HAwG5w1NOzciGOTAuGKVW0lXrlJhv/AVs5N0tVmPBUkoUFhIZkdTqZfMVQxP2cswy2ZzhhYANbKrIXOrPTWMYnk4fnaiLMNflJAi58gxA= 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=bi+uN3hA; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=ZfOgZwAl; 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="bi+uN3hA"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="ZfOgZwAl" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62AIoBJB3760222 for ; Wed, 11 Mar 2026 03:23:41 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= 2imLQEZ3DP0uNNL0l/EieMjW7GOO6W8UDPQGg+15sw8=; b=bi+uN3hAWT64qvot eOcetLiARrcyKxacyWz2TvMFQwS135aPvpmnm+JOxCuU08leJ9Ts+zk+hU0Of5LQ EyGjjCAvOxC91iMJtI+f5ZbzCpVSU+8mhUcTjyQjAEtmMpb5ClSL5iif1TkcOPxq 4T0bqKiksAojNlmS5zhiE8bDjeg3/JChKjdDAfpECq61ep+H022rLhoeeUhko6Je gHyW3BCKAq5HPaDvn5oMrnVu4WGgoGMOs07iE3gTG0vUmSZ1JMbRbPglMKjewQT4 f2+KCsrFkfJOW7n/22XCJRIKxLieZzD8lM6VhMJ0FI4LPoAzKqMUqIxnJD2AKAwq jEE0Ng== Received: from mail-ua1-f71.google.com (mail-ua1-f71.google.com [209.85.222.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctk8uk0ep-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:23:41 +0000 (GMT) Received: by mail-ua1-f71.google.com with SMTP id a1e0cc1a2514c-948df60cec6so19447396241.3 for ; Tue, 10 Mar 2026 20:23:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199421; x=1773804221; 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=2imLQEZ3DP0uNNL0l/EieMjW7GOO6W8UDPQGg+15sw8=; b=ZfOgZwAlEx7KclAZr4d/qxbICcSxQOE080caJG910wXZk9tbZ5SydoOzJE/lWuVHxB M8/aK/eyq3ISt28+PGZNNOYAHHR90VIps3tSd7aq+O6m1E3cDimcVMHsOvZqD5hK++uC zVSplGDBBJ/fialQtRPvcmosjhkvvFo0NaGIFhhlAJiUnlK3tSjqCDko1hMgRCS1j2Dp Q2F3SHnFU8q16Uhl1aFg+70c8wuM5Bc4fzVqg9hLB38c4ZWQF8ul/2AdV76VXIHa4jcD 4yawbQXXTdr3wgtQNCfvRPBzUtiz8xORgEmuNCS1zScCkIpF1owi5vpd4SWn1sOWE+tp hUog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199421; x=1773804221; 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=2imLQEZ3DP0uNNL0l/EieMjW7GOO6W8UDPQGg+15sw8=; b=uhNQIkXgn9+y9V5N6ohZltyDXiBBvY6ILD+nBQY7PHF8d88Y6NxxYLVdrkrcPU1vT5 ekKzrtl6EjkTwUOB/u9YrRTuttftd1eWOQ8b/6PPZQP26uEXpufeHd0qxJf6TlqNcawl vwN787l92A+e89u7akZYjDyw/TS0ztyar4MlSczrTejsDeYJGYIkQcanKZwMqo7Qk7W2 Cu7bgsweEdMiv3vx89OFGFZ5owhgaZ1yrnAwjeIsejvwgWuLeuK/5P5PPWT7ZKzjfbN4 POVbqMGGgsK9jpDBo7evsb86jDJ9vTXF1eo6TY7X0nzhDNtVyqLE1xe8jNcP48PHoHTG CGtg== X-Forwarded-Encrypted: i=1; AJvYcCWUEWpvvU54uVTmnvcY/zZqlWdcKLtyzjBwiENDb9C4bWw5FUQGc4qHA+EssCwZauo41i5iGBed8AJR5/w=@vger.kernel.org X-Gm-Message-State: AOJu0YwA0DK2EUyd8idHVS5uEcVhNpgp6lDaFnXnkNA2sj4nYQONsz5I mR/EbBYBupUeymcU+kYG1auFDbPjx4+A9o6acFC1LaTpgy4YCFkw7vSGPi948byjncv4FUUbq3D RpCe/FLb5M0UN/2oY2vqRXtX1d+E8o+EOCfHtYQiOFUhV8+nF2nQsU3v7RRJJ3AuC2/Y= X-Gm-Gg: ATEYQzx6hhGV7ZDElhUc1z2EeH1r3WP/F+7olUyIojkhlWwZT5+tbDo0fgPb3rjT2E7 l/L8rDlzhqT530pD9eWz7a83IN5SV79VAzz27yHw32uQrrmST5xvQpMKToaEPaciu12Z10oU4aE IJyLD3IRSbvnigJN2xLiD6sra0vgdHmkmjNzq3pQ9E9a6u3JL68iHlWhrFhi7xFGmQSNLHdbjMS vpLOio/oufNPjLh9CSt+243ATelTPj9KaQEi1pyyLBTZSTSaS8hkJ/q8lNP/8JfhsJqKsGnI5Gy Iv2ZP9csY1rJTpm+vxAaUuzfzHI2o+xvEU2WUl8XGi0eUt1FmCBQB/kCljNCzzN9ek4Y46BZY42 GSHES8XwE+MmhoS/JNcGiT3J45eTskmrIxYOGF0UJgRuy1dktWuybhNSjJFY007UlPfS9fwMRMV CgRoS7gefP0TnPX+Hcj9MB6MozK6k+eRO3RmQ= X-Received: by 2002:a05:6102:c0b:b0:5ff:dd9f:3ea1 with SMTP id ada2fe7eead31-601df08a60amr335115137.39.1773199420659; Tue, 10 Mar 2026 20:23:40 -0700 (PDT) X-Received: by 2002:a05:6102:c0b:b0:5ff:dd9f:3ea1 with SMTP id ada2fe7eead31-601df08a60amr335102137.39.1773199420280; Tue, 10 Mar 2026 20:23:40 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:23:39 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:23:03 +0200 Subject: [PATCH v2 09/25] drm/msm/adreno: use new helper to set macrotile_mode 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: <20260311-ubwc-rework-v2-9-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, Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1533; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=2pmZHdByL6nsS8Ik/InzKdBxSCO/78Oop/N0tOJ6bIw=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsOAechTZ9XoAK7n5aLj/5yAMGhW3pYNcBz9gI Rxy20WvghSJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabDgHgAKCRCLPIo+Aiko 1cVlB/914twfY2YCfjzpjaUgBmoWPZo6OmU6kpXruh6VZB6E/hMqaUg6dGhJYhlihvuO0SYBWlm jQiT9TvIPmEPd+CqCwd0wYr53qzzTzXLpWxuiUl7KJw81kAVFD4wf/0hJcwBC7d/2A+2b0Cmt/m MIVG9t+S2MDebnyx6BIwgRkcTewT4CM7EccnMwNhwjlgbplTCwwUtG1jivv/FFrHqvTRzHweb+I 89nEbY8I4CrdEFLoX3rd+hye9bVV5KcXWeiZrRXlP28tJSZUNrTJzXlIELB6iWU5h8/Z0TgthjV CR8IyU77NPVvbOiZyis2JUu2lQ+55lbAVhzcBTOR81RoInaH X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: -9ybV4iruSH0y7e6XL9bhSfS73S4L4YR X-Proofpoint-GUID: -9ybV4iruSH0y7e6XL9bhSfS73S4L4YR X-Authority-Analysis: v=2.4 cv=YcmwJgRf c=1 sm=1 tr=0 ts=69b0e03d cx=c_pps a=KB4UBwrhAZV1kjiGHFQexw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=8BxV0iZMnHvn5dZpj2MA:9 a=QEXdDO2ut3YA:10 a=o1xkdb1NAhiiM49bd1HK:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfX4lMx6X4dx6h/ z2N4/hJiPjt28s3xCTXOLABTcrFdl9vohkIWLPSnbVsj71YvlCA1dqVwIqdfiV+EvZB+56/s8yX Mcqf+yWzz5ucAt2UmUiMgPYOgYET6bAwdZshk6TBdkJEqkkA9oasWssQPxUCQImbPswEFGSVqAy zq1Y44sE34AcxcDTeH1AB8x8JUUEVZY3v4MuV97PJwOu/kE9w5CV2NTbeuiDxRPDESKxq3aLe4M an3itswDvyT6et3/B+eTUiW/Lp1nUxufdj3jcXJ4TZWlnEUBNm/kzrc/pKZ4ZyKB/RmDJT3ljp2 PdWMAUUeI7lz7k5xfrKbclVpPQ6P7vYthDpqJOPktwN8Q5mB119Dzod9CjTTATyEAqd2K4qGhEd O/8VspsXOJCotJIpYodZ+PX8L7zx2J6Ia6xReCVPjCW/C22hxFB3gHWlzTLjCMPkyDzhq+PuImR 8RKZZrST69uy/GsFCaA== 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 suspectscore=0 impostorscore=0 spamscore=0 bulkscore=0 lowpriorityscore=0 phishscore=0 adultscore=0 priorityscore=1501 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110026 Use freshly defined helper instead of using the raw value from the database. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a6xx_gpu.c index 2027e479d5b1..56a820ffa613 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -787,7 +787,7 @@ static void a6xx_set_ubwc_config(struct msm_gpu *gpu) min_acc_len_64b << 23 | hbb_lo << 21); =20 gpu_write(gpu, REG_A6XX_RBBM_NC_MODE_CNTL, - cfg->macrotile_mode); + qcom_ubwc_macrotile_mode(cfg)); } =20 static void a7xx_patch_pwrup_reglist(struct msm_gpu *gpu) diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/= adreno/adreno_gpu.c index d5fe6f6f0dec..4814233d8dba 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -435,7 +435,7 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_co= ntext *ctx, *value =3D adreno_gpu->ubwc_config->ubwc_swizzle; return 0; case MSM_PARAM_MACROTILE_MODE: - *value =3D adreno_gpu->ubwc_config->macrotile_mode; + *value =3D qcom_ubwc_macrotile_mode(adreno_gpu->ubwc_config); return 0; case MSM_PARAM_UCHE_TRAP_BASE: *value =3D adreno_gpu->uche_trap_base; --=20 2.47.3 From nobody Wed Apr 8 01:18:32 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 51629363095 for ; Wed, 11 Mar 2026 03:23:46 +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=1773199427; cv=none; b=mNwoSnbg9Sk5LeHMoiNc/gLmg1PcZPyqjzzG3mtGj9qY1fetY92KL6GjeYNdbq3kXFKT4/KLBH7R33CiMi1Aygeh5RGMZ1cJUrtFqJvNjukm8JnfGwsYj5YAOYjaGZ4dapbY7DjRO0kET2or5icyIKNeM7HMHgp9yqSUWwGHXC8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199427; c=relaxed/simple; bh=Q8nHBL9aa2WdW/t5nAUsHsORcWzw1wI0nDN5vKUfyFk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bH0xvclHFxuy9MlZgOEKE5JIPpB3lpTwykc83wXsV92DOFN6Wk+R6U3ViSSwtgv1l3pCvS28412R+EUVlaqki9XW3pUWSc4GBIQCNRazUm3QN6qbB3Meywk++kdC8ZaJCpy0or0aSCwiyuFiMEWYq5qBetN35dvWE/PgUJ8TvK8= 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=BgTARJuf; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=fbNShNge; 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="BgTARJuf"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="fbNShNge" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62AIhZlP303910 for ; Wed, 11 Mar 2026 03:23:45 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= ObK6ICCUnKq+NtFyUqm9Dz+ktCq+FEBWAvwrB0A4ScI=; b=BgTARJufVBFXbkNf va9bffX+WpLoKDrAV5cVGKBR33Q+ziBVy8NXt+Tyvh6zHwNeaVYGBFD1IflAFyLK y5WJNUmRZUPmgzC7EUrvLnfqelIgW1vLK+EMSmPb3xyc3+ByCf2lDbnag+8vFMKh RP57lnTj47o6JC1tyWVkOZNclDds+AI0K7vJkcoiXejqv8LGuxgQWkkPUpT3OF2O rQzh0xVnc3t7WopzQ4OlKukMrorDFwmDEO1H4tgnBFXWK8gECwpCF3smRdLqCNNs vwGpy8eAIEPJHRDsTpYjFNqpqu8+aih14L/uy5G4gr5vFH5pBTwDuljd1tpWVXTG gEAarg== Received: from mail-ua1-f69.google.com (mail-ua1-f69.google.com [209.85.222.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cthjf3end-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:23:45 +0000 (GMT) Received: by mail-ua1-f69.google.com with SMTP id a1e0cc1a2514c-948df60cec6so19447548241.3 for ; Tue, 10 Mar 2026 20:23:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199424; x=1773804224; 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=ObK6ICCUnKq+NtFyUqm9Dz+ktCq+FEBWAvwrB0A4ScI=; b=fbNShNgeMxPprsX5CQK5Lecq1Y1OnXe1RxkM4u7pbSvw8iHyM9l8nveuBDl2pYLtKs 2PGCSdPEBHT1JMGrT6L9vFurOZgw8ZPxt/uNBLqeQVPG/1ZvlwPqDPKaNoHOsOd6aGny +FPbjBxelXNjuIyIV8VpfEEUz9cVGWM8TwYYREBsN9Zs+bdOoOW/TV0zyPExjlEwvRx4 bUWQIeoFnhgoWGT+5+1z27ThrlpfvIPut4xuGG45K0Wgxnz1+GDc/HPOGSigkRZcPdeg ABsfxp6BdRsaRZJ+pns7uLZEQ0aklPyeWb7+J4Vb3QBAO1h57hXMypFsMdxoIQhxlgGj 5fzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199424; x=1773804224; 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=ObK6ICCUnKq+NtFyUqm9Dz+ktCq+FEBWAvwrB0A4ScI=; b=gcZNvnfKHEoKS9Ao0HeL+6i8HpFBaIUsAfhI8HTD0I0G2jRtwzdxtE3IVBDLMM7JGC acZRdQHoXLnu4RCz4lYfmoycg/s15Oiouf3Hj2YQPcFf3okV2EbsE4dx165N67/t5YHT nltdCQAwTUJF10Uyx7Q9FcUXTmRh3CI3PyaKTEKBbRrI4at0LObihHN+I1Rw74xjkr6/ 7op+IFAq9E/qeevp4fl/f7AgJOpCZL5rfl8SCRUmV0ywF4Bm9euzVFY4xVdxXCvdE7Xb cOfBfFByScs1MwzQwfm4RWo9qzSf7KsynuYHc7TbzTsfOwt4pl/kBz8a/Z6qfKME+BPZ 2OGg== X-Forwarded-Encrypted: i=1; AJvYcCXhmQO8sxaj5wjY1Yl3HsIzimf5Nq+ix/qo/3qYCqrx9W9xzEn5SmhtPF0eD0JPxbZdf37WIDM57tohdlI=@vger.kernel.org X-Gm-Message-State: AOJu0YzQMIYH6Y3tFtAXySVOuSS3cad2WmeTLjrXvpI5eZc4Vr1VuUa8 wuXiIIWABxfkJbRbK94dnstTf411z8yUjrsMdK8pCafadcWN91/lIt7P6m/tBWLatDIXt3rAjnd R1FBKVM5NUVrU6PjO6Ljqg0YHWJ1znHgQ02KcJxxOAGui+4PdQNpUQXSkQZ+Rki5I4Xk= X-Gm-Gg: ATEYQzz3etEivumcevhmLn57e+OOjbRMWjc7gLji6R1OrwaY1EVWFfAb4ptcNB9bY16 76SfVopFCDoVqGr/liUeOE116MeuwW+q5hJjiplKUbFPN9oy6sKV8OyY71UnOCL9WI4b/TI9eqm gJLoqmsfRpEd8voKp52p49n31m08+lxL7TizrMwqUv2km5vozCJt4MD8ACGu9aM+t8Xy5AIOiv1 pry7NCeyFqsXUA0zaM045i97xWCMpnmHiMgXyJM9rd/uQ2pNRANsD/tHQ2XUAPjwnmb15zdqpi+ PCUryLtHnSCfLAVbDpeRBweRnEkjNVIOP45IEM9qzx90mUgIQi0zkU+D1/yKmOSeMQ8q1oaPFxp 4SgCDtuEMJ1yv4cpZRWq6sl3YMPc7zrCTc5lChqPjrTsRHRUN5UR1V8REydufNzPIAqinthLk2T dHRs95BmyVsekr5XueLt+3xBrRRao7Z9OvlaI= X-Received: by 2002:a05:6102:440a:b0:5ff:2426:94ed with SMTP id ada2fe7eead31-601defe4dd4mr394273137.28.1773199424564; Tue, 10 Mar 2026 20:23:44 -0700 (PDT) X-Received: by 2002:a05:6102:440a:b0:5ff:2426:94ed with SMTP id ada2fe7eead31-601defe4dd4mr394255137.28.1773199424161; Tue, 10 Mar 2026 20:23:44 -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.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:23:41 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:23:04 +0200 Subject: [PATCH v2 10/25] drm/msm/mdss: use new helper to set macrotile_mode 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: <20260311-ubwc-rework-v2-10-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, Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1170; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=Q8nHBL9aa2WdW/t5nAUsHsORcWzw1wI0nDN5vKUfyFk=; b=kA0DAAoBizyKPgIpKNUByyZiAGmw4B7INzp1K5mWzjaLeBMuLjEYU/D/sdzcLPzQvF60YN4LM okBMwQAAQoAHRYhBExwhJVcsmNW8LiVf4s8ij4CKSjVBQJpsOAeAAoJEIs8ij4CKSjVOGsH/23+ kZc4rUv3ieE5d8Iw8lr7JPetL5DW6u3J0PVeXW4zAPotJY3WDGczhnCjTTNSC9qD7Q7Ehxgw6lj rvIzkSvzKwCehQmO6cOODh0QadY1hxQ7rYq4T4DE0LiEdVgls3mL9+xzM/eRqP930ar3yC6Kyeh Am8PgAWyQJVMw3OjaKFX4oXThARvhpWvZvZLBoOeqty3GFxljO+x7+qveMF8ZTJ53XSGkXDj97x 81DU44etSWTD4kjaa0V9XKBYPNVbxA30ljhTwZMmRFhrqbR7sClOtDUG9U3pYU2Oip3RMtNpI6A YsqqA2K2kIipI67oz0YEkKGLdYN5HvEx068ML+8= X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: 366Adon13IGRSJxQwtGhO6Lj313URy7c X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfX2CSBN0K2sFbF peGWeStvGCXz1LwkGCBl1F3OQnHmOl2fE65ClEtfGYWNrAzX3ukwJp9nbbxiAlzh6BhUpcLARiA +e0TC8G8tledDyShhcx6ZYhJd78ZVA//fY5Hf6TqLmQAAii9vr4SgBKy/n2Z7axQalZJ5ezrG6/ d36dffLNaap5RkWxWoxGLvltNuV1XKpi4PoD9qE4DvhdBP1kddBU1thCvbxh2dO7+EvYHwIeGK2 99hzTqmR3ThaHGLRY3kmhSKvhxBMkOnQUy8pHKhSKbgzkKSfmnl7KYsR7AB80dwVmXo2vOsRYha ZrsKe96zaKFWWcU41+/wCzElz+w1STi1Ujm2I2FQ5cX9IZzP1vGCxodQ+vMpCZBxMbB8xPJ5KTZ 2085SxBnyeMmtM2CBedGYxFt7sIHDzugF/UpsxRCAgjTGxHNnIaA+qurTcqFAkNBJKdMy2w+WPo 9oeY2E3r1GusDOv0rgQ== X-Authority-Analysis: v=2.4 cv=A71h/qWG c=1 sm=1 tr=0 ts=69b0e041 cx=c_pps a=UbhLPJ621ZpgOD2l3yZY1w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=ujCctoy6CNRHcyqwK_8A:9 a=QEXdDO2ut3YA:10 a=TOPH6uDL9cOC6tEoww4z:22 X-Proofpoint-ORIG-GUID: 366Adon13IGRSJxQwtGhO6Lj313URy7c 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 impostorscore=0 phishscore=0 clxscore=1015 suspectscore=0 bulkscore=0 adultscore=0 spamscore=0 lowpriorityscore=0 priorityscore=1501 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110026 Use freshly defined helper instead of using the raw value from the database. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/msm_mdss.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c index 49ad1a9bac23..49e7a6a4e5f0 100644 --- a/drivers/gpu/drm/msm/msm_mdss.c +++ b/drivers/gpu/drm/msm/msm_mdss.c @@ -186,7 +186,7 @@ static void msm_mdss_5x_setup_ubwc(struct msm_mdss *msm= _mdss) if (data->ubwc_bank_spread) value |=3D MDSS_UBWC_STATIC_UBWC_BANK_SPREAD; =20 - if (data->macrotile_mode) + if (qcom_ubwc_macrotile_mode(data)) value |=3D MDSS_UBWC_STATIC_MACROTILE_MODE; =20 if (data->ubwc_enc_version =3D=3D UBWC_3_0) @@ -207,7 +207,7 @@ static void msm_mdss_6x_setup_ubwc(struct msm_mdss *msm= _mdss) if (data->ubwc_bank_spread) value |=3D MDSS_UBWC_STATIC_UBWC_BANK_SPREAD; =20 - if (data->macrotile_mode) + if (qcom_ubwc_macrotile_mode(data)) value |=3D MDSS_UBWC_STATIC_MACROTILE_MODE; =20 if (data->ubwc_enc_version =3D=3D UBWC_1_0) --=20 2.47.3 From nobody Wed Apr 8 01:18:32 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 E41E6371863 for ; Wed, 11 Mar 2026 03:23:47 +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=1773199431; cv=none; b=qVjWoSNp5CfPUBr5LJdhGlff41DOfohgeJrL1QIGYbpZ0WCmC0e4kmY8Pdj6omNQGmKgzBKjt6OP1c0qOX8mHUdnYYBUWdLAeV9lAMq7VlVZmO3cE2l0LtWU97vcJO1x0j/Y2AdjSQKKnCZwNY0i2ZJYxc/ESupQworECVEEWiQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199431; c=relaxed/simple; bh=K49X78cQYefYAi6H1TnQ+qasfdkGvxo87cdI/yz49d4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cHONxYzMZJvHI0p+JixFQsGsdn71ZuWLO9vIVDZgNwe0jy20rtf0uK4Oisk30WyP921GIRromA69FP7DWCfnRkh00kfhehhSucX3FuATk4IWw+fiaM5icGdBc8a+c3ThyWlQVovEAU3+z5YLQawGOn23wOmnTF9LF7kZInMJsgg= 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=BA4NSYO+; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=UtcHEjNJ; 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="BA4NSYO+"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="UtcHEjNJ" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62B06Y9e1265806 for ; Wed, 11 Mar 2026 03:23:47 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= bulI9HIn/5sXJBmSMBiJJ/8d6hU/vbxR8xGhgN9fpS8=; b=BA4NSYO+fKLsEm+4 yG2PTjygZPWd0qY2zE8HE8PoE89SpGEU8osIa/cKkIDCjrownjT684LOfcDgiceK irJnpmbiWZbU9Y0IOKKV/URUUfWdF4cFK4Fy+yzpjoVkQAsBTmNR+KLhgv9Lw/Hq tmsxiRQgfXP0WNFrzhqKHyPwNs9TFWqedTKoTWhBYKIEBGbyeLfMBUmVLgObtOT+ nxveDRxxIU9wFnHRmJXmrPJavyvLhMIiZp7CHWWtRF7PWH7V/Swwg89jDsEqLGcu PPBq/4Zfb4jZNACAp5GHevL3Cbog7vvzYZyODOh9pzGgEQlT+bly5HnuEa7AjELr hJD1Kg== Received: from mail-ua1-f70.google.com (mail-ua1-f70.google.com [209.85.222.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctpkfj3sx-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:23:47 +0000 (GMT) Received: by mail-ua1-f70.google.com with SMTP id a1e0cc1a2514c-94ad0d8eff8so4506565241.1 for ; Tue, 10 Mar 2026 20:23:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199426; x=1773804226; 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=bulI9HIn/5sXJBmSMBiJJ/8d6hU/vbxR8xGhgN9fpS8=; b=UtcHEjNJRYuZJpZneqGzNLY8A/C9JeT8iW3stwf5WKLM3or0EiNoPCcduqM2M/vnGk XWaUZeBJbZCsAZWZfbORIFwKn4T3SxY1GeOZonhKy3z/jvA6yvCnnPuu7XT4H0FKsg9A Udg4e549IEtbZz7h4nYvyORHmj9I/WADEnUJROMudczwCr/arWQWjI+TrVUoO54ZG+Ah 5P4yOayiZc30JXKUdKoz6PxGNHvCjcyD5MNEauOzNPRMOXddOntIV+wfV5FJ/waiUMA+ z+OCW6j6Q/T8gNaOhen9b5o9QEWvWPtTsnXm7lGNVgYXgPO6ChPsZGU+R8ICwNFN/UWV PvDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199426; x=1773804226; 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=bulI9HIn/5sXJBmSMBiJJ/8d6hU/vbxR8xGhgN9fpS8=; b=MJ9qJ9AAY1+uKeR6fNOvzc69XUSaEa2F18nxPghTOq7GBuMSmKbEqVGaWq73FqYjTS Bo23JoPPUsS67uIICDYjZDfGcvbu8TG88Bif3WuPX5vvoxUNFmAUezBuuYM+vvcCs/Cs 8eBS6rygRWqIDgIHuMpVDfNF7lJGyYGPAVQhyWeom+g7BwHgBbzGetCIyaU1uNWfRBun thwW3Mqhr2UCdjM1bOjo47RWV1Acd05XNmjyKNApkmgIN/gXyU93oqpYFasGq+YkWr/U 5qUyeJKFh3F84m6tFuDJUe9xrqq/bPJKssdyyBtDboi/nKczrCs/1BY2A3Dgci5rzLXm OtpQ== X-Forwarded-Encrypted: i=1; AJvYcCXtyXrIiCTV0rzA9umpL1h6F5He+NimCyokidjuUD/7rr5EN7EWaN50RmL8x2RhTrcRFDmvVl6Rv3gVbEI=@vger.kernel.org X-Gm-Message-State: AOJu0YxyD/cz0RAf4hiLrT+xTM9kO7iN67HiXafK8IUPFZ8FYMgFV5sJ nan3bindZF01hftSTKzFWvE1rzH0eKYCD50Q/7yMIqY4A7i9D5YLAd6Ar68V3hCt/ArmdwpLnbQ 0VUfp1P0oCss0G4jKBLipbhdapnlKGPHGev3Ja/Mbdm7rtix1jSwXfjf+rGOrihOaX2c= X-Gm-Gg: ATEYQzyJZxqohirQfuG9fgCix/C5zy90qvsgLqYfnDZYmJbCMkli6leoAXNHgu34+E/ AyjYqYGjfiXwT34V717z11lnG2e4hG3yUXmHHSYWZotgPo8DD7S0oa4JJ9UglDoIRwe4MhrQWYe DJU6qLOG0iXK9hHBTHYInTNv7XKu9KahJ19dqCbTTtrCwKiv0Tyt3foAFtOD5HL5loKTHfCSkfR oNBlANpheQ/KGloRMKaSP1US0UUoSEfh+z5nxbcslJvqx4S6SA05gSD7sCy4Fgd1z7sysSHjBQR l+xUqzGbm6IJjnOoCAS3x6ZQL0d7CUAlTlK3l2CFCq1SfNqmFbbYUDLoVOFiQfJmEXQTb4QeI1C BMJS5Rv6znHwoyQe901ondeJPIMK/7Gik1vPGUyg7PjxP2+xRbjKSKU3Vr0pSxFje2QdHUEsDTK i1wNpMRHwIN/Hl3N1qGUu59CGQ1Fnvv+Mdeu0= X-Received: by 2002:a05:6102:3a12:b0:5f5:3739:100d with SMTP id ada2fe7eead31-60039fd081bmr2271248137.0.1773199426351; Tue, 10 Mar 2026 20:23:46 -0700 (PDT) X-Received: by 2002:a05:6102:3a12:b0:5f5:3739:100d with SMTP id ada2fe7eead31-60039fd081bmr2271230137.0.1773199425939; Tue, 10 Mar 2026 20:23:45 -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.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:23:44 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:23:05 +0200 Subject: [PATCH v2 11/25] drm/msm/mdss: use new helper to set UBWC bank spreading 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: <20260311-ubwc-rework-v2-11-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, Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1239; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=K49X78cQYefYAi6H1TnQ+qasfdkGvxo87cdI/yz49d4=; b=owEBbAGT/pANAwAKAYs8ij4CKSjVAcsmYgBpsOAekzSl8ucJxfHFB/1y9bmW9AvxMnyjYAtJ/ juCRqIJGC+JATIEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabDgHgAKCRCLPIo+Aiko 1aKMB/iF2RG2U7HbuM3hjiAc5u94xg8Cy+xW+3Cx++8+byu1nxDmnlHD4WXYIqFfmUOa5LXf59a pNo9GOTwAKRo0gkwc9fy6gRi7pYx10kR/qXsTEt0UDbXq7YwUV/i54hiV5h4zZLyPV5wsbKr5Xy aG8MB1HTx3Tgy7izw4/VAmr8FjuQavnAd5EGRdTctWyFV9ESp/MpHt5sUJW7WCpEWQTtl9XvVmJ 7mGK7TErBaS6zY9hwBNIe2NRmS36Lo5aSd01pYPAq/Ckq11e8+xozG5oYcM2Pydwe5eNwBG6CLI AP3tsAwXfJ2ldMVXi9sXY1RhUqQC9B8j3LE2186XXW2V2yg= X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: FBuVwlXwYe64ocWwB6XqF_EWHz8qonq7 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfXwz4TLGdEObvf no/M3AM0Qp3eAQYVI73RwyRzRjKRHHCSnGoi1hCIRxdO3kwYDxvxgL/jRUouoxpj6u3RGw3FKg5 O/gian7Mjq236Xqt+IW+E0QjSuDbwDcGw/TsbSZjb3d5zY4xWqBYPsxZlJ5fybDOgrVDnvKe07S zFLKeDgg0hfiTpOLqa+G9HwiICW1bdGA/+lOM0bzENaTEbYK96tlwaZePyHCJ4R7LyWRQK3D0Qi BAw3zyV5JeZyq5lx1XL+OOfjESw4/HyOcUAtCCov97+wEwbcWdq4Q0LNs/e89a2SHl/z7nyAUvF jb3qkLIyF77zqaGSlGz12Kzqq3TJO4Y7v0h0GgbDHmWkSxtCgOsdM9BvST3O8kY8G7tj6BZaRCN TEV3jaO/sJHumYpcEsNLnb+kCZOqhtHYS5ziEYSzhM+uT/lC06juxVnhUzndnLTth7/IN53BVXo M1znqFkpteJiGtJeokw== X-Proofpoint-ORIG-GUID: FBuVwlXwYe64ocWwB6XqF_EWHz8qonq7 X-Authority-Analysis: v=2.4 cv=Gq5PO01C c=1 sm=1 tr=0 ts=69b0e043 cx=c_pps a=R6oCqFB+Yf/t2GF8e0/dFg==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=ujCctoy6CNRHcyqwK_8A:9 a=QEXdDO2ut3YA:10 a=TD8TdBvy0hsOASGTdmB-: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 suspectscore=0 malwarescore=0 bulkscore=0 lowpriorityscore=0 spamscore=0 adultscore=0 clxscore=1015 priorityscore=1501 impostorscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110026 Use freshly defined helper instead of hardcoding the checks in the driver. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/msm_mdss.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c index 49e7a6a4e5f0..c28bdc21fb1e 100644 --- a/drivers/gpu/drm/msm/msm_mdss.c +++ b/drivers/gpu/drm/msm/msm_mdss.c @@ -183,7 +183,7 @@ static void msm_mdss_5x_setup_ubwc(struct msm_mdss *msm= _mdss) u32 value =3D MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle) | MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit - 13); =20 - if (data->ubwc_bank_spread) + if (qcom_ubwc_bank_spread(data)) value |=3D MDSS_UBWC_STATIC_UBWC_BANK_SPREAD; =20 if (qcom_ubwc_macrotile_mode(data)) @@ -204,7 +204,7 @@ static void msm_mdss_6x_setup_ubwc(struct msm_mdss *msm= _mdss) MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit - 13); u32 prediction_mode; =20 - if (data->ubwc_bank_spread) + if (qcom_ubwc_bank_spread(data)) value |=3D MDSS_UBWC_STATIC_UBWC_BANK_SPREAD; =20 if (qcom_ubwc_macrotile_mode(data)) --=20 2.47.3 From nobody Wed Apr 8 01:18:32 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 AA20B363095 for ; Wed, 11 Mar 2026 03:23:50 +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=1773199433; cv=none; b=UexdmvaSi2z+d/N/j8DYGfDFkQfa+l2F+L8UxnlXrg5CMwPXASKoSvzppMdzSsRR9IYOSSs03B3BV+GmQehnSENS8z56G8Sct02lux6mDdUxHbzKbnKGzdlxR6+lnl1CN75naMeh2bb3FbmUs3g+aYKJHfl8Wm4p+ZGtO/DWLEo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199433; c=relaxed/simple; bh=Dp+N+Bk8UMYAX+OsWFRzXnJ6xbH9DAMBa3dOlN5rF0s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NFyWnsp5+ZqiBhw6Cpt2zN0Hmon3yFoXwzrqWuy5mSWudi72IYomlMix7piNgusnnGzoJQLdcR/pNhglcqgSRdSh+zIDyaA9w48n5fHwwecO8yDdI3mOl3Z1JlZME+KyP4RLdq2ITQjU/2ar3PcYmo6nUQ+escg4enSP4F+SZ8o= 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=apZPe43U; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=JuEbkW8b; 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="apZPe43U"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="JuEbkW8b" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62AInSJV3760444 for ; Wed, 11 Mar 2026 03:23:50 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= jqyKT4W/cNuaTzUqSFqRUV1yQx0wbYgJqqv8//555T4=; b=apZPe43U8Pl8U+mL ydHIqqJCFMN8yvkO/KJ6xKxDyqHqu2tSIqLZWzg4u337h/0mZIu9Ln0/7X0csQJy 6c7cCPUVd5lGX8pNCGwe0SccSjGFIHMUa2eGeXkv7SQLRlgKo8PgyGMgi+Zluvz3 rO/1Xj8umhM5QPFkc1AjwtosG2I2NxPu/sIlP4pm6T3YUdwXwt0xLgTlfYyzVytF Qa0C2CiTFb4VWSTv+8dttX/aLmfNqvyJANkTQPTugLP4yEAr7Jotkn4rRBvXZyAC 8INrGUgs2W7KHh7+2Tv3TToZWjUPBuoTYMsMf3P7GegmpFmRc1mV2OCMA7/ZLY3+ 5lJ+qA== Received: from mail-ua1-f71.google.com (mail-ua1-f71.google.com [209.85.222.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctk8uk0f5-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:23:49 +0000 (GMT) Received: by mail-ua1-f71.google.com with SMTP id a1e0cc1a2514c-94de7380eeeso10323675241.2 for ; Tue, 10 Mar 2026 20:23:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199429; x=1773804229; 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=jqyKT4W/cNuaTzUqSFqRUV1yQx0wbYgJqqv8//555T4=; b=JuEbkW8bQsjI/ZCG3D8dSGcI6ff+aviN8s1Eu4LbXTKiqxH1WIH6lkb5odUHY0sUzz 4EhfeWEFxl4eqHOJPRV4bhZfcvYbDOf1JxdYpjwKven6oPe7Gn+l+S+enmj33EbSHIn3 6STIaAkQ4DK+729w1zhS9SzbNp/pD4v9NkQH2zIXMXDEigQTwOEhawY+mm50/3xEptNa 6KlYyuveez7wI4x1lQPXnPGDsDuFttRuI24aeB+NUwHt0IrubszgYFEpsCuhNVqbp/p8 vmFmi7+0MQAA7n7ptnd75wKjZLeQ5GOsrGcuIjAkc9OE+BoMRuaHN0kD6AXBM/yjqs/y qObQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199429; x=1773804229; 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=jqyKT4W/cNuaTzUqSFqRUV1yQx0wbYgJqqv8//555T4=; b=PKHt5gYklkRfiUNDVExCgUnxJnnM5EqpCA4QSbAngCgJwTc6Pc+JGMQfDMdOBwrlIJ XsUOQKrTMAVznYN0L4tbGzzk/3/rUXlYUMtDm0E+qOryBPTRVfHuZ14SP0gBEBquYX7N oUpgg1KWzq+/irrgitLV0SH4tOJyvSUZV+4/C4eiNxujDwH0S71vFKDFSNAdFCn7TxCP KDuMr73+SSJ0Ax4+hk+OTFJrj68vl8xZNq4T8opAHzkx/ImT4Tzpg4KRxJTS2LYu+v50 QiR99IXJcO1uCPwrouI3Wg52DlyzKDc6aDQC5NvVNU70+gTNI9k/89Hm3imxgLGSImfG agtA== X-Forwarded-Encrypted: i=1; AJvYcCWLyrq90QHRLTrQGZYD81fyb2oXbUiwHfKdIRW1iQhyfGgM1oqqXismN+oABS4uBDAbDsxP6pnLYak19sY=@vger.kernel.org X-Gm-Message-State: AOJu0YwEH76r3+5FlV/CVImY9q8MA0PyW/fEIm/2Rpr4MIgUeUcYc6KN vFYX4PUq0L9uZSBTOHhFew6ayPIOx8/gD9DRqIra5I7OBxawOKNmcWUG99L+9OLI5ELJ2usgZVC smzNg8sLcc7SDUJnmy+nrbcM7lFa9w/0FqxuZhqGVRzgkKKivv9YeRM59Po10rzKE9Bs= X-Gm-Gg: ATEYQzzzW3ZM9IgI/KyuzNgMCmj01UbDQp/gxks2/Blz6Ze/+G4Yj224l0z/g8rERzj O6UrGuTWPAdEz1C8relP+9L9RZcbLPW8nVRzsn41nVEzO36ox6iR1ZZQfs3KE5AhqVI3u+tB93b aSe0V7q6OnxV98BB/QkZ+PRs8EOQsOX2hahmjr9Jx4XEKMIEEFx8d4tn+R75wE1GsFd5YA9qTAK tmSZuzmyvsqhAjQ01MSi0CQxZcfHTJJab7dG8VcccdA6qMNZfuJVXvtZfNPyYrL5017OFo/s4yM l/WJ+Z2Rq7DUICb3dYI7/IQOSKQEUbSOFWKxXdQvKKpr2cueT7CswarEwnFSbQI0TsoOU2DQkvJ CTJAxL4YskL5MjeHDYVdFI5uHmCW9MR4j+LTpSPdebfL9dTK94ErXbkudnqE0BRyNm/CQzYcwaQ dVxdF7XAaDnwo2NntByurxuWijljRTljqEiAU= X-Received: by 2002:a05:6102:510e:b0:5ff:dcb9:9222 with SMTP id ada2fe7eead31-601deb2b6a8mr492828137.7.1773199428948; Tue, 10 Mar 2026 20:23:48 -0700 (PDT) X-Received: by 2002:a05:6102:510e:b0:5ff:dcb9:9222 with SMTP id ada2fe7eead31-601deb2b6a8mr492816137.7.1773199428587; Tue, 10 Mar 2026 20:23:48 -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.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:23:47 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:23:06 +0200 Subject: [PATCH v2 12/25] drm/msm/adreno: use new helper to set ubwc_swizzle 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: <20260311-ubwc-rework-v2-12-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, Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2707; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=Dp+N+Bk8UMYAX+OsWFRzXnJ6xbH9DAMBa3dOlN5rF0s=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsOAeub//VZeYzLSiRPsy3mVca9T9Lf20GUVzD fwQSSSdEbmJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabDgHgAKCRCLPIo+Aiko 1dkPCACrAf1IYYTZl95PYbR0Onc4NkkXHJfcQjbyO47fcf5qTMXdzfZwaRwV5yHQ1sprgXpISkm lWmS7W32c3ibD5JaHltliQFkt0eukwfZSBku0+DRfkGRjLiv/L3D2Qllo4FvYzVoe5Wr4c0TqPY 61Bu+tSP/Pgzbvpivu4Cojejo2nRqgiv7h28/yzvoo8Z0zKNOhSf9d+tn8OsgVpjNjEi2dSzZ0F S3TT436BdQFY4fBVhUJyqCVfMYL3gJcvkPIuoNqViNikfVggmMau9g4DC+nsDw3DTAL5P3EoJxH LnidAB5JalxfOl6WwpZmBJUC/O95iPLOQKkoCvrUBUTtm0Bg X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: t3fD9h9ua-eKUueKDr52I817kC2ueBwl X-Proofpoint-GUID: t3fD9h9ua-eKUueKDr52I817kC2ueBwl X-Authority-Analysis: v=2.4 cv=YcmwJgRf c=1 sm=1 tr=0 ts=69b0e045 cx=c_pps a=KB4UBwrhAZV1kjiGHFQexw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=0JjmiBfSQHijSEXDZO0A:9 a=QEXdDO2ut3YA:10 a=o1xkdb1NAhiiM49bd1HK:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfX6mvutr5McvcO 1Nle+uBgAY2g2AFG5luIOCcdVunu8XFgXkxj+xrobOhQO+8ElC/xVIIBuqqyMi5snDYskcRqhBR dH7MJFKOAruygU2cefKMVj3xfoaLWfqdmRwzEFFTNw5xpZnQF220cJbaChETrxfBhtL+h4kqeO7 NAAVXvDb2Xpf/wpwe345MU8lJrYac2KHxy+Wlzk7M7tKQTgI2SQgNuKPdaXPAm3wPrspBQlfnum qBx6XilGdd1z4PDTIHzJZ0ih/17vM+syW80jyOrcQx6MX1b0N7Pnbm2GQqOZgymS7yLktwGGavB PJJK/M/rhHfuElfMQiWKWP7iYmmT4h68zGfyQWn9oNppteVWzakYBWvwx0i8odH10O/xcfpvjMN NcD6UnZpqgmosA/nF6zdpoI/ngIIISS/gxWKZGd6/Kd9G7YqLcqYVrK2YKxLUtR2JyVYBo/5QpW PXkEt5vh7DnJLgMLOKw== 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 suspectscore=0 impostorscore=0 spamscore=0 bulkscore=0 lowpriorityscore=0 phishscore=0 adultscore=0 priorityscore=1501 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110026 Use freshly defined helper instead of using the raw value from the database. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 4 ++-- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a6xx_gpu.c index 56a820ffa613..7be31de3b525 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -741,7 +741,7 @@ static void a6xx_set_ubwc_config(struct msm_gpu *gpu) BUG_ON(cfg->highest_bank_bit < 13); u32 hbb =3D cfg->highest_bank_bit - 13; bool rgb565_predicator =3D cfg->ubwc_enc_version >=3D UBWC_4_0; - u32 level2_swizzling_dis =3D !(cfg->ubwc_swizzle & UBWC_SWIZZLE_ENABLE_LV= L2); + u32 level2_swizzling_dis =3D !(qcom_ubwc_swizzle(cfg) & UBWC_SWIZZLE_ENAB= LE_LVL2); bool ubwc_mode =3D qcom_ubwc_get_ubwc_mode(cfg); bool amsbc =3D cfg->ubwc_enc_version >=3D UBWC_3_0; bool min_acc_len_64b; diff --git a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a8xx_gpu.c index 6dc1d81fcaeb..680f0b1803a1 100644 --- a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a8xx_gpu.c @@ -265,8 +265,8 @@ static void a8xx_set_ubwc_config(struct msm_gpu *gpu) { struct adreno_gpu *adreno_gpu =3D to_adreno_gpu(gpu); const struct qcom_ubwc_cfg_data *cfg =3D adreno_gpu->ubwc_config; - u32 level2_swizzling_dis =3D !(cfg->ubwc_swizzle & UBWC_SWIZZLE_ENABLE_LV= L2); - u32 level3_swizzling_dis =3D !(cfg->ubwc_swizzle & UBWC_SWIZZLE_ENABLE_LV= L3); + u32 level2_swizzling_dis =3D !(qcom_ubwc_swizzle(cfg) & UBWC_SWIZZLE_ENAB= LE_LVL2); + u32 level3_swizzling_dis =3D !(qcom_ubwc_swizzle(cfg) & UBWC_SWIZZLE_ENAB= LE_LVL3); bool rgba8888_lossless =3D false, fp16compoptdis =3D false; bool yuvnotcomptofc =3D false, min_acc_len_64b =3D false; bool rgb565_predicator =3D false, amsbc =3D false; diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/= adreno/adreno_gpu.c index 4814233d8dba..cc21b41cae26 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -432,7 +432,7 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_co= ntext *ctx, *value =3D adreno_gpu->has_ray_tracing; return 0; case MSM_PARAM_UBWC_SWIZZLE: - *value =3D adreno_gpu->ubwc_config->ubwc_swizzle; + *value =3D qcom_ubwc_swizzle(adreno_gpu->ubwc_config); return 0; case MSM_PARAM_MACROTILE_MODE: *value =3D qcom_ubwc_macrotile_mode(adreno_gpu->ubwc_config); --=20 2.47.3 From nobody Wed Apr 8 01:18:32 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 5743B2E7F3A for ; Wed, 11 Mar 2026 03:23:53 +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=1773199436; cv=none; b=iTxmje8evtrrcgghEX90Z4N1iPSbizBl5y9LZCVKfhpxih2Uj8Qdpog4zIRd7cs27HtC2l7Lnv9omSOuuy4tKwwqaqjJYbGmTN6fu3v9OmTINA1WVXZ70wXWkKWFAwcUgd11CnFRtSAh4O9wrZ1P7qorwcbhXj08UI6Lx53w8hA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199436; c=relaxed/simple; bh=BQXxAsNkcgoIebP1VAZBuBHx3qvfk0HLeeYsTxoyeyM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TngYgF3rEj82AU0ZchD9LcVT6waBFmOxcEtObZTUjVirxeXz7G87vEi1i9oll3kmuQ0Tb3j/R494jtOesM74qD/Gz95EEjbFgP/quLXJTzcLA3hFUctGZe3z2ZSD5swFzgm8M4IntSeoNfOpg6AxwkTo1E5ogD0V7EB92uI+CuY= 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=UF70PI67; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=cI9OSP6X; 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="UF70PI67"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="cI9OSP6X" 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 62AJQtAP3295836 for ; Wed, 11 Mar 2026 03:23:52 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= wJB79bVUZrsbxSexjswx340+SsqpUDunWLmQTkIAkcU=; b=UF70PI673THNW/9y GURpeEGLod+gCEH4KvjdYCxvaNJ7YwIy45zGgKJYqnDqPJcm25OOyadZQNqOCdeT 4mDlGcqPFRzjR+WVXF2MhWM9yev5Rjz4D2Ut/PFA6aIb0gMVFR+buRL2ckN2ukS3 4sj+t1mdW+Udu5iiBJ7DRrSfAnOyNTt6Av0txdm6q486KWFrRHef3EKBC7ZWxZlp n6XPLEVpuXYRtXgvhQN44nAqAVyx8lMdcemdL69Nr1G+fVOgdq59Em+GRRLMF64D I1cY6Mv4woKS0WdklThhgydvQX7DXKYICOYThUR2K/uuJCsFmf4KBq9krYNkLQ3Z XkXN2g== Received: from mail-vs1-f69.google.com (mail-vs1-f69.google.com [209.85.217.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctg1muse9-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:23:52 +0000 (GMT) Received: by mail-vs1-f69.google.com with SMTP id ada2fe7eead31-5f934f736d4so13651422137.1 for ; Tue, 10 Mar 2026 20:23:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199432; x=1773804232; 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=wJB79bVUZrsbxSexjswx340+SsqpUDunWLmQTkIAkcU=; b=cI9OSP6XEye7LpOfskLGJxxFvpyiaiRoLI/g/kO7OtSkCA3uNpuksHOMCHryNdBTET mhODBiEU300oOaBLq1VuuF/8gujhStutm8XLLO4CPa9wy+0vvlmGF+tWHXT2FBV72F1D 4ZN1D8kl9kALeXyu2doQcLQO1ibneE2wVvez2kCiKrM0jwiEVRAAnt6RZAuWD0RZdcfV oDpYvc9AToatgG01sPLFbKj68ClmEUQFLHumvjEeS97J4tpVdJ6Hf9WGe/rTi8g86wkr B8roN73Cv5fzX6borWYO12Lu2ZN8DlFa31Jf31fNuJORX8TpgL1gQBbR2jS/ILM0ov05 2flQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199432; x=1773804232; 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=wJB79bVUZrsbxSexjswx340+SsqpUDunWLmQTkIAkcU=; b=uOkoefwx75o+aDxVjWSjTacW5cK2+dkX/CGDSK7OCnchQp3xhnLUTWZUS55uJmfu4j hfDGdaFMbdRfFmVEzEn8d48qCj9kVT3yO5e6YSV1CBId6tsQgNa12KWEnPCazMy8heqJ 3LGVcdRNEYYV3cYyi0sZ7lAcdORQmUkzRcsygomIFFnXBfPOCSZG+4TMFNWmcZl/Niia Em4eR0VIZsExowpeqCMOwSjQq9nXso1RSYkIuw5q4dD5BsdWAF24GVTmZ/evMTGDhgh3 58Xer9pJmOm4efwUodGHRfOxcrASvzKfwNdKzwYjX6aIE2/kENQgAMnrW1OuJrCL5Dnd jxoQ== X-Forwarded-Encrypted: i=1; AJvYcCVz+zsb1HkwrJmRcMg8FwCvhp8F88fwKcw8R/UaUyaM6ZXRtzEiBN059er8kGj/vxGJXYAzZg1iAMeD1Sw=@vger.kernel.org X-Gm-Message-State: AOJu0YxshAzZmpw0Ql+X7MRto61thoiG2kirBGzdfnzIj8hCrp/Rrs5G D0dmDi5bPhdSazx5VNv2DCWiTicykVCm15L7SKXmIxbZrXR1OcNZpWZYVI9bXJUiImCWbq/2954 OlNH2q9IxBCWGW2zOo5RhqX8y71+1SjsLmtyE6jJisW1oGxIalfs/ejxTljjxmS+w/wo= X-Gm-Gg: ATEYQzxgIxjgXyM/9byBZ4z4jyhWC7EmGvfaveb2ZX+4AxJNd0InT845JXNjdbv8wv9 EP9d46cVcRUDQGVvz8Ts7qXSnRvLp7qCbqhLnP6kryW4DPovdj7zj2QuULkVHD3lNgbvCGQztOc WpcOcvplygmoJNGHfZiK3f9yQkYK+G+InQP4xNXCPyKFz5xClNDM/C0WfujS5RY+vCTrjhUFemC 4/S201/XnMbCB+TD9IyCHgCL/42dVGIRFy16zHZVFvwLWFrKFTIbwNBxpUlyg4yBRGxlCnQ9cvY GOc1TKmThdIy8BMzdDBP7v/fKb4F3UOyYoBTyo4lv7QnlT8XIoNliHeHD/Ccwa6Kf82J8p0sOEK /FQAMvraKbJEeNPMoXP5jjtvAd9G4pi6alLGG6OVVJ/TbA8StABuf9VvqCSHENbEHQtSh4SX+YP 3U/dTkMtK8CfwQyZA5uHoDlkOmWmtVAEz6kwU= X-Received: by 2002:a05:6102:cc6:b0:5ff:cb2c:a013 with SMTP id ada2fe7eead31-601def2ae84mr377081137.29.1773199431662; Tue, 10 Mar 2026 20:23:51 -0700 (PDT) X-Received: by 2002:a05:6102:cc6:b0:5ff:cb2c:a013 with SMTP id ada2fe7eead31-601def2ae84mr377064137.29.1773199431215; Tue, 10 Mar 2026 20:23:51 -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.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:23:50 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:23:07 +0200 Subject: [PATCH v2 13/25] drm/msm/dpu: use new helper to set ubwc_swizzle 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: <20260311-ubwc-rework-v2-13-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, Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1592; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=BQXxAsNkcgoIebP1VAZBuBHx3qvfk0HLeeYsTxoyeyM=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsOAf+MEDFiFXRzUYyYP9Bp3XX7gDytbRI1moX AQYEekYgcKJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabDgHwAKCRCLPIo+Aiko 1V0gB/wIaYDlzH6MS3WkaAX++Av89arWPoM5JKEjyf8PpWgMhvDUDFknGf3vd9NzrlX3iaGJn+V qWxzovrHwKsOd1YPBRz96EsaAXJLgNSYRHHNFretd4UTmTK56YeeEzOCaZZU9T+9xl+cOQV9urE LCPgsCdYAxJniHQaAlKuw9tAU08kYPd8uA4UCf7YInUKdojr/rn7BnrhGC024SQlHc8oJ42SdA2 UwPop7zg7gbA2saFyUT7Jyye2Im0xKc54qLnpulw+UIXm7mhWAPPJYtw6C1J7dTpLp5pUG/iqS4 9WmuJE6UX4oECKee1+anJnj9Aoei58aUeoslAzN7yrlW6nUh X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=YOeSCBGx c=1 sm=1 tr=0 ts=69b0e048 cx=c_pps a=5HAIKLe1ejAbszaTRHs9Ug==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=46QewcZEoJiMQYndSOUA:9 a=QEXdDO2ut3YA:10 a=gYDTvv6II1OnSo0itH1n:22 X-Proofpoint-ORIG-GUID: eWh_IgtW6AxN8aN6Xla0wH91v7496WNQ X-Proofpoint-GUID: eWh_IgtW6AxN8aN6Xla0wH91v7496WNQ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfXwO2rk9RoM+/7 sD2rWTH2c5V9jP0qHNxVTeG+Q83Zl2AzKllUpdfVGI4B1m0ldCHLTlr2ZJbiwbRFk16rA6LJ4xO 0zGvyoaYUs94ykqu3DUUnJQm+3bnLWzkVNYgg8edPC0GrROLTS5edJrq37kSHDRa02jT7N21qEx sc1XbU0fLzBt1LMRIYJKv9F0CNB1hYEVpiiEBBh5Trx4BIRfUbHQZgAYEY2HktYlmgzb3CCyWO0 PQv3wxPY5IbTze4VI3tuWmvoCi/kg1Jplox9Nlf4Z2GijJOpOiwn8L1EyRCHIZxGOtcfNCFJiP1 Jn+Kd99BJZy5UUuG3SoR9D49ajokCo3X1gwom0c7ipz6LA8Dqsu5yGfueselhaXVdgfit7hcllR IgebGwe8jC3/C6GjmL0wiHx6clXQC0cpgv4W3hTDCnz46FrRXmnqAgDZNkKlE8eJ3UslOs6plOo 5uzg8LuR8Z1o+tUmy2Q== 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 impostorscore=0 clxscore=1015 spamscore=0 bulkscore=0 suspectscore=0 priorityscore=1501 malwarescore=0 phishscore=0 adultscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110026 Use freshly defined helper instead of using the raw value from the database. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c b/drivers/gpu/drm/= msm/disp/dpu1/dpu_hw_sspp.c index d3da70009234..6089a58074ac 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c @@ -318,13 +318,14 @@ void dpu_hw_setup_format_impl(struct dpu_sw_pipe *pip= e, const struct msm_format =20 if (ctx->ubwc->ubwc_enc_version =3D=3D UBWC_1_0) { fast_clear =3D fmt->alpha_enable ? BIT(31) : 0; - ctrl_val =3D fast_clear | (ctx->ubwc->ubwc_swizzle & 0x1) | + ctrl_val =3D fast_clear | + (qcom_ubwc_swizzle(ctx->ubwc) & UBWC_SWIZZLE_ENABLE_LVL1) | BIT(8) | (hbb << 4); } else if (ctx->ubwc->ubwc_enc_version =3D=3D UBWC_2_0) { fast_clear =3D fmt->alpha_enable ? BIT(31) : 0; - ctrl_val =3D fast_clear | ctx->ubwc->ubwc_swizzle | (hbb << 4); + ctrl_val =3D fast_clear | qcom_ubwc_swizzle(ctx->ubwc) | (hbb << 4); } else if (ctx->ubwc->ubwc_enc_version =3D=3D UBWC_3_0) { - ctrl_val =3D BIT(30) | (ctx->ubwc->ubwc_swizzle) | (hbb << 4); + ctrl_val =3D BIT(30) | qcom_ubwc_swizzle(ctx->ubwc) | (hbb << 4); } else if (ctx->ubwc->ubwc_enc_version =3D=3D UBWC_4_0) { ctrl_val =3D MSM_FORMAT_IS_YUV(fmt) ? 0 : BIT(30); } else if (ctx->ubwc->ubwc_enc_version <=3D UBWC_6_0) { --=20 2.47.3 From nobody Wed Apr 8 01:18:32 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 072CF371888 for ; Wed, 11 Mar 2026 03:23:55 +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=1773199437; cv=none; b=ZU11FdIF3ep14OuzBsH9wA51aY+Ir6/y6LwwrUYIYeidoPDOeV9vsRQsqS3yz08vldZgBAjPtRGmMhPsGtCDGurp1VD8kGw2TNZ5hkGllt8+62AikpVHBctwJ7W7s26n27B+Fjrklpe4ZYR62crwjewrrB7rzCYfQp3wcPmg7FI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199437; c=relaxed/simple; bh=atFJQP9/usuM4FRY4otJIO9yTCLiPPC8icE9Lv+0nTg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FvUNe3OK3+YxqP9ZsRbvFWnvt6a75hBQl84ZWVEHyT+MZSrChJBzXGEtDr0eeOyf8yZqVwHctkKPVk06BWLG1ucn9UprAZfKTDwE6hucp58yQZy7KJiqaM621MDq07UlwaDCAlaumzrygxr9D6QuD8fOrGKAsX8GwsQnp6Lc9hs= 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=GfdsAQCm; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=e9UQu9Kw; 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="GfdsAQCm"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="e9UQu9Kw" 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 62AJ07ov3417921 for ; Wed, 11 Mar 2026 03:23:55 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= Q9lDD8STPEjxzwqupY586LWOYSujuCVqRMW1zTbWzsI=; b=GfdsAQCmFnbGynTq Ako71aQ9zFhUJ3uitDr8CZupcre/pjxe1tD12LUJ1Jslw+iR0DZ5tIkrv0fbxvVh 6f7yQcb/gtokYczCnUWr9+MmDfOhhhrTkoLUPP+xHpAD42U8mjYF1PxFxC49Uqf5 Bxuot/g1rxzPDs531JCKU9b+lLd5bp/JuhGNorFgadNY/vjAShS/eU7D7Fw07net ClIdXJZvnNcwy+tSXwndkTIHFL/RMwhVd6xrVJsvGNpkZc/gNusEbmxxjKJW9tHT tApjurGslwGt+ldFWdT3o+I5PI0fHoWX0/iol1tYFsaWC3yRk7w8/0yL8Ff9jGFZ NQxqCw== Received: from mail-vs1-f69.google.com (mail-vs1-f69.google.com [209.85.217.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctja2b62q-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:23:54 +0000 (GMT) Received: by mail-vs1-f69.google.com with SMTP id ada2fe7eead31-5ff9fd0dcbaso9687271137.1 for ; Tue, 10 Mar 2026 20:23:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199434; x=1773804234; 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=Q9lDD8STPEjxzwqupY586LWOYSujuCVqRMW1zTbWzsI=; b=e9UQu9Kwu3Ut3CS0i+2ZK7yHjKfcFaBZHM5Dk1+uVXyX9DoU7v+WdgxzcLEx/95lyP 1XUDpK5OESR4nCU8/WEUcTFj5IEMaG5reUwGa+g6hRo40tTMWCG+RWcywttoYQKV+FWK qAiAKSIv0WrqCb5FHJqT7PXAk780lsLirPYWraxuEbfpeOrCLkgc5GhCwk9+g/TS/LUj 3c/iexwcYkkI7RhfMQuY1v+1PEpvWLc0Q0Hv7TIgac+CWtATQuyJdCdyxX7FU6kKBFSi Xxfgi9jSY+gJlz/aeyZ69hIHUp2o048Wu5FZ45umJul/dr4B8GKUiCy3M08qazg+r2qK zgSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199434; x=1773804234; 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=Q9lDD8STPEjxzwqupY586LWOYSujuCVqRMW1zTbWzsI=; b=IhcsNEEBVI8rPEJE4Juhlh1qsBnnbMjTf1x5VhjaasvXDBXv4EiCpT1xnuP4pQoYMZ r4P4WIVoHN1wLbAYHdEWI8H8nr8UimjtMnOqO07KI09S7T8FNsazrWYVZc4DTTo/P8Uz a+v9SodueCtrvielBbjI5CVV+lhxegGZ+ohP/SCdjcjp9//LT6yslVucq3SUSOielXXj 7wiaUqeNV6pLTwMyE0N8FqKIUscDFWHgPe3HrKUOzHvCOdamVnsqAX8XGyyA/Iiay4P4 h/kMaGjKVsbqOPKsbwI2oKjyn9/GG6110P2PfEuoLhJpr0G6f2cV1nFSUzV6Jd1ajby6 CDJA== X-Forwarded-Encrypted: i=1; AJvYcCXyPhfIOtY2woVjKxvsCX65dMAWsGXjjHd17dt8/9y1c+JRatLPgZCLKLlq/2ZO3BopaH1UnYT6hv+WmsU=@vger.kernel.org X-Gm-Message-State: AOJu0Yx4Mst04UanbbAvHw+qpHZ54fYWcM18N/qLEJ6GWZKU78BZLpIP +EJRZ/kGy5uONE4oJYfB0UwcZRkCI9O5MJ72Wk00d2sRt9J2qu67ssFSDq2JCJLa8aPWTYi0hQO lFJQuHubt4/OsWN2Kp8B7UlYCJnnllwgwEMsnwtdFdRqecx/1PiZlOq4qfInoK+Shghc= X-Gm-Gg: ATEYQzyM94fJ8s2WLbLhzyk0WQ9K7RzNz2urzZu86v02QlzBkWdwN17W8xh55DnsIqr SB1hgVHna0lTbBp/PT+rwNRM3pY6cEmVlNqFqR8Cfx8soZKC7S76gWTRZZVFCoameIdNGwjb+PQ MQZRF8MZD8Q6uJysPzNsZKBZvGQ3OdCOkwT6fRc3fIwwbz94ih8KwuzHOsg7QhzM724dJaDe1Vy Dn49p+gLIcZMFMa0MXKijoyMj92jf55mAPY0w7yZ2O9rFmjMHd7P639841vFrLo4XZF99AUn1iu 1oweW7d5Oybsb7FD309TNODbuOHi0gmhK7R72fJfF8DitZ8p47WQwgk0l4owhOTp2dFBOq6pwiH XqtmGTw2d9reiPvh/Ewz7S6fXxJjtKkRW2unosMwqMS2sN8lrgewo40lDgGiE1U4qhc1V5uHaJV R1FlFHTiJcaETwVemI7kxY1B+4H7e7uBfJsg8= X-Received: by 2002:a05:6102:dcb:b0:5ff:ea98:c2dc with SMTP id ada2fe7eead31-601def73364mr463678137.33.1773199434252; Tue, 10 Mar 2026 20:23:54 -0700 (PDT) X-Received: by 2002:a05:6102:dcb:b0:5ff:ea98:c2dc with SMTP id ada2fe7eead31-601def73364mr463656137.33.1773199433843; Tue, 10 Mar 2026 20:23:53 -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.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:23:51 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:23:08 +0200 Subject: [PATCH v2 14/25] drm/msm/mdss: use new helper to set ubwc_swizzle 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: <20260311-ubwc-rework-v2-14-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, Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1997; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=atFJQP9/usuM4FRY4otJIO9yTCLiPPC8icE9Lv+0nTg=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsOAflOdnbVa71oM+AEie4Ga9xWTywVRK8ic9L dD9sQ0/abmJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabDgHwAKCRCLPIo+Aiko 1U3uB/9fT6d32sWGFoD4Ek/GEvHpGp1CYXDPAeXNR9sz279sC1S2DQZX4uDg4yN73Q5ssDyHzrO eH5tYIVyidhdjlwuS26+zRnT5hhW5kw+swCkgpGs7PJ07AzIbRUgQlN7isynM0pNiwrw/+HwMQp b9CzArzhcxRkdWfGKh8lTgnaDa0FFqG1TmijlDjvHIwAHRdCbZ1oegvjR60mC2rGYmDJ+Uqv67T 7BlWGfA4/YvLDK7+djDc1Fmg1s/v8AJSVNGo9ytimbLC8hYkkxfPCYjrRyDv+MDLlqf3Ys+vjFm NxZZnCETVM/HEbOe5i9mtQZhBDO/xc7y58rZNkfP88C15Qtu X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=c9WmgB9l c=1 sm=1 tr=0 ts=69b0e04a cx=c_pps a=5HAIKLe1ejAbszaTRHs9Ug==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=lYHGZ8dQhJ3a2aHNycIA:9 a=QEXdDO2ut3YA:10 a=gYDTvv6II1OnSo0itH1n:22 X-Proofpoint-ORIG-GUID: AbBngNQ7cxKXy4HTXJDuY41dyRfiFYQ8 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfX86hP18oG+fQX MXJx+n7xd3W63jtv9JvmZCeppgkniMDwHgC8B6D/zsqLMadoAGzBAAbgp5HvXOG58f2W/5poJlC /s4rmfUH/Gf8qb3S28iX1vFldWDtmYzRZuoMDuP+eNSR1ue2PDiuZIxz7FndvxH+prgYH60ZQtM Y2lL0fMw2P0jpMlsUb/W59V5TOEB2jt3Gsnidxil8lQWJFCuyY40W0KBmRrO4CZ0hUTHWwi0CwK 3LlIp4bnDOPwYHQfsWVZzLgXQ+tyZOEGRfUjQhHjxe4/pW1EymgANAQKpP7G/WHB4SY6iHM8chs Z2KaaCRyEqi1pOlr5m3+h9gEdXuYVJgiQRVDiV5V8LwkPgol4O+itOjfiDYtaxCHG49t/N+yGj/ eumiKORgzl8w/5Lr6j8ucP0hvQF8hAteAHdL0UFJanQxZz6swK7ETKyi2vEKqAKPQLravP04GH1 Fmh1SFlpu958LYJqgmQ== X-Proofpoint-GUID: AbBngNQ7cxKXy4HTXJDuY41dyRfiFYQ8 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 adultscore=0 malwarescore=0 lowpriorityscore=0 suspectscore=0 spamscore=0 clxscore=1015 impostorscore=0 phishscore=0 bulkscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110026 Use freshly defined helper instead of using the raw value from the database. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/msm_mdss.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c index c28bdc21fb1e..0b15d725566c 100644 --- a/drivers/gpu/drm/msm/msm_mdss.c +++ b/drivers/gpu/drm/msm/msm_mdss.c @@ -169,7 +169,8 @@ static int _msm_mdss_irq_domain_add(struct msm_mdss *ms= m_mdss) static void msm_mdss_4x_setup_ubwc(struct msm_mdss *msm_mdss) { const struct qcom_ubwc_cfg_data *data =3D msm_mdss->mdss_data; - u32 value =3D MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle & 0x1) | + u32 value =3D MDSS_UBWC_STATIC_UBWC_SWIZZLE(qcom_ubwc_swizzle(data) & + UBWC_SWIZZLE_ENABLE_LVL1) | MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit - 13); =20 value |=3D MDSS_UBWC_STATIC_UBWC_MIN_ACC_LEN(qcom_ubwc_min_acc_length_64b= (data)); @@ -180,7 +181,7 @@ static void msm_mdss_4x_setup_ubwc(struct msm_mdss *msm= _mdss) static void msm_mdss_5x_setup_ubwc(struct msm_mdss *msm_mdss) { const struct qcom_ubwc_cfg_data *data =3D msm_mdss->mdss_data; - u32 value =3D MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle) | + u32 value =3D MDSS_UBWC_STATIC_UBWC_SWIZZLE(qcom_ubwc_swizzle(data)) | MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit - 13); =20 if (qcom_ubwc_bank_spread(data)) @@ -200,7 +201,7 @@ static void msm_mdss_5x_setup_ubwc(struct msm_mdss *msm= _mdss) static void msm_mdss_6x_setup_ubwc(struct msm_mdss *msm_mdss) { const struct qcom_ubwc_cfg_data *data =3D msm_mdss->mdss_data; - u32 value =3D MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle) | + u32 value =3D MDSS_UBWC_STATIC_UBWC_SWIZZLE(qcom_ubwc_swizzle(data)) | MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit - 13); u32 prediction_mode; =20 --=20 2.47.3 From nobody Wed Apr 8 01:18:32 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 1F75A373BE2 for ; Wed, 11 Mar 2026 03:23: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=1773199440; cv=none; b=bDTaHbgBgg4pfAcxUwntx10mu6BwGA5Oarjn3cbkBVKiQ3eW/cMQlYQc727PviS3J64tLjxU1TOyL8Ipq6KPhV7R8xSfAKX3oQRM5Ik1BbMPBZJnE/Jvs8bBbKDKpgtUvM4MNQxMf0bvb9Zm82QVPaQikFhusa/WwRunKlwfvXs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199440; c=relaxed/simple; bh=hheiMl8VJ8rTRpyUKrTSw/T/7nX7ElA8etZcspaY4GU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=r5n+1BP2AhGKUjeJ+lvcJYzGNZnqDyK7kabMfKInOYhnzvAe2laE2Ic/oB+/cBmdNnhnJ5yAKJjAYy2/uXyr20ckb4DGODdK+rfg31lAf2Y10H9M7nAjcwT/c7/mhpRx4OL0Klj0yqhf4sm6Pu7xybMdZkAgDNbOCVLjsSOr3Qo= 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=OGt+OAA+; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=GQRg+cVh; 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="OGt+OAA+"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="GQRg+cVh" 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 62B2qwGA2179297 for ; Wed, 11 Mar 2026 03:23: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= h4ycaMV7nlSUQ5du4YcIwqCqGJ98D+lbtRqht+ED2K0=; b=OGt+OAA+AGTk+EKV GI0IuGn7jdbhfL5NeLBjnpVDWqUyUPaZ8WcsPvhFQzNndY9IcvjDp1YOt74+V3RT LMuEKizgzMTCmErIN8297nEHbx3dL4Zaq94PQunvGWtmhCqfco8ThFciCf830qmS XMIdYUadDJZfObSilubYRVZEhfrbtMHpl6SNmaDNl8hfDMB4GTdP5Odc2QDxol9A XtYEGhcytGlDvALk9j2KjodrwXgB556P8XW2n9edEKjERx7aOc/w28ANWfHEa796 vi79IlgAhXsZPKfaQtHAXZv0VfbyFJtYtUXjPinpCT9l/0MZDhNvR2KHxyYo3DnA Hwqb/Q== 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 4ctqvsspd0-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:23:58 +0000 (GMT) Received: by mail-vs1-f70.google.com with SMTP id ada2fe7eead31-5fff2d5756fso5769522137.2 for ; Tue, 10 Mar 2026 20:23:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199437; x=1773804237; 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=h4ycaMV7nlSUQ5du4YcIwqCqGJ98D+lbtRqht+ED2K0=; b=GQRg+cVha/ynVEAcqCxFx0HmuSwSwv6b6JEWVB+OfQrcR4IiM71NAWvBHLxbk4043l z8ukYnQg/jQxIs6Hz9+sGykQZKAHMhbY+cPNVbQ+sUOe29FM0J79F/McQSBVDRogvqCQ EQ+b/fHK2LfN6u2WzTbJhMnh0X7P/z8yQuRI9eIBvDZRpjdCXArGMydmi5CysbbRSq7I q8DjhytdUXFtqTyK04ra+ZsYbqhkL+iD8FUaLZHvYgtqDXujtYsVLbHlmxEByUV06JKU aInrdc9iBCLykKgm/RFAz6tKhm1iz9z/IJUEaYEZmgnSqCj3VxtGuRwTJMdrJQZDN/1y Z4aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199437; x=1773804237; 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=h4ycaMV7nlSUQ5du4YcIwqCqGJ98D+lbtRqht+ED2K0=; b=G158XDqh+8OFLpN3fKVtUQ+gJkrT0pBRmQ3K5xL/jB8F8BXdNtvd4xO+wpQC9rv0oz AqKKdSoq5J/ZbUauALopQI2FSTA87rt4Xob0zM1OYpLetfltGaU/WKSmaJz0Qh3LRtZf 11n8DcfvlD8rgq3l2POUPZzZWcraI2KQxAdUHvyjbXDB5oxUJWyC82ozI7Q2dztmD6kZ MOynKXYTNLsl5lmuvWpBp2CpVLM359WOlCHYgvlm8Pte1rr/yCo7bKHDoAJKkyvRtEz7 W3K5nozTZiEdGRt0vuFV5/rdbjt1dgPAhOal9oLLTFRDMpYS/j2mHfNexefm+Rcfioa8 Drhg== X-Forwarded-Encrypted: i=1; AJvYcCW8SGxdHSHlAx+LfXYspmu98on6eCZglF8FTkr8IR4peCrXm7lIZWB1eaifW3V4ysDhLjaszMq+ePlOFfg=@vger.kernel.org X-Gm-Message-State: AOJu0YwOUOJiZY4DTpxSA8K3x6cRsZvO5aSytmsHJemFXPq3bc7Yfurk crQ3ZLs3T83Kqbi0dzubvPbtRZY7lceTPXMJi12p8+VwuI+ahqfCrdemedotruOur42nG4reAON zJG6PusgyZwGc4zN16oq6rAL7TgdXSIKxWS+dzo6wgeM234T+LqwWqG+lEhj9AF8g20I= X-Gm-Gg: ATEYQzzkFMkd0AG3xWG39Fu327wIuBtn3MDun68+GeyDyoN7nETVUuThm/tbCPzNVbW ioV44Iva2PFAf57LLHcHZP0G0aV5eNmVEfOWNBwedDCPyy9gO6O5xgqz2pTjwHd7C2vgJc4LE9N ZHmvRPdN2I16wYCwxDHRrpDKUxklIOU4d4dfmhI9YbTgX73O822SW4IsPgV+aUCOC9RvMv/Hp0j +7kIeU5b94BeayrYEfdgIwAlbKShRn2kDWE1K9S/qiQRL/a2lK5anzDrx+0CUhUBCmq0B2brhfH llFZqCLUNWGEOh/pd2s2JQk9fcE8oIZdVbeObnAFGB0TGhl/apGkQhK+zZREyQWEp9GdlNAPIJH iHDC13NlmWcQqY7JtbETLAUayLS5OLVTrKTYmPQNNgGMi1/uw+C4IsfImk4y4TSYs1ZWTMjjyCx 5mzuK5iJIl5KFb2/C1V+2p0r2CV7sz3OigtN4= X-Received: by 2002:a05:6102:512b:b0:5ff:22f5:e37e with SMTP id ada2fe7eead31-601deb4d089mr414178137.10.1773199436808; Tue, 10 Mar 2026 20:23:56 -0700 (PDT) X-Received: by 2002:a05:6102:512b:b0:5ff:22f5:e37e with SMTP id ada2fe7eead31-601deb4d089mr414172137.10.1773199436417; Tue, 10 Mar 2026 20:23:56 -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.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:23:54 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:23:09 +0200 Subject: [PATCH v2 15/25] drm/msm/dpu: drop ubwc_dec_version 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: <20260311-ubwc-rework-v2-15-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=1070; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=hheiMl8VJ8rTRpyUKrTSw/T/7nX7ElA8etZcspaY4GU=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsOAf6Zw99zPfcAxdo0QZI7EPBM1yeKycqZW6F GRQ7TppzGaJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabDgHwAKCRCLPIo+Aiko 1aTSCACXi8i9dYm12XNBHO6u0UAwCu7XTpH0EPFyGKnFKKB8x9QjnH8zwayGCWiViXeFYgiR5mH gZRkHpsstV5HwYvFVs43M4DJRrzZct+aDZcqgNU5QKrN4IuYm8NbpcVlcSRp+Gu5555/GwxGcq+ TTVxxyKqyZ03hZShpcRz59o7GCAlkzieHrqht1ra7/8VDUGXP0ZaC/BZNyl+A8uSd+U49zbVZZO g8FEqyWXnPOqaZCcS520e7KNP8IaRjLjKkzgmWX+xDvBf/ARCHL7LYR5fv1qxpPtjsW7bQ7a9VS DXPan3AOjWZLkqs8AQigUCMw3zP3eqYQC08pVYyCp2o00qmd X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfX4qoOOVwATOce wwTd6JqW+PY4OAWscXifDRD9GvmFChNnxuxtD1XgfwpHYL33XF4D51AviBn/HYLnkNi1CHbiit5 W76VVv32kmLosHOgEM2RDHqHFkn2cQvOPYwhgeJjshtTLTlf8uC5oZXN2jKDVKcm7CHMPrjrhtQ Cm8vNXyZsmvZsH5lkFtl3VmF1JHqgRMLyYHVu+yc6Fnry1IXP39musaUO1j6fwM1IXTcPWgKcLa jkUae8VZ2sB7Xm6NGg8XJWekClnS9sVQkoWCGBvLr/hfxoFrDbaZ7Re/Dlp1YlPnvJ/uLvhWSPc 8aFfRD/Rt66AuVdEvfhuOGFwy2aB1vjJcCyjWEFouKRmpfkF+MknBskcRpmCnZqlQyYnT4AJ8m0 NSpjdgNx4xZl7LcfCTfpOtU86BoYOGBpGEJ05uSRkXtg5zl/5hLwXZWYorItmGjTM0qCP3hr5qq eGLnR5YftINOkNSFsmw== X-Proofpoint-ORIG-GUID: IJ5aoy7I_9IBQlvgEvZt03wq52L_pWOP X-Authority-Analysis: v=2.4 cv=Lo2fC3dc c=1 sm=1 tr=0 ts=69b0e04e 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=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=OFVxzADIxEWc22agC70A:9 a=QEXdDO2ut3YA:10 a=crWF4MFLhNY0qMRaF8an:22 X-Proofpoint-GUID: IJ5aoy7I_9IBQlvgEvZt03wq52L_pWOP 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 priorityscore=1501 clxscore=1015 impostorscore=0 bulkscore=0 malwarescore=0 phishscore=0 lowpriorityscore=0 adultscore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110026 Stop using ubwc_dec_version (the version of the UBWC block in the display subsystem) for detecting the enablement of the UBWC. Use only ubwc_enc_version, the version of the UBWC which we are setting up for. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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..f424be5ad82b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c @@ -1718,8 +1718,7 @@ static bool dpu_plane_format_mod_supported(struct drm= _plane *plane, uint32_t format, uint64_t modifier) { struct dpu_kms *dpu_kms =3D _dpu_plane_get_kms(plane); - bool has_no_ubwc =3D (dpu_kms->mdss->ubwc_enc_version =3D=3D 0) && - (dpu_kms->mdss->ubwc_dec_version =3D=3D 0); + bool has_no_ubwc =3D (dpu_kms->mdss->ubwc_enc_version =3D=3D 0); =20 if (modifier =3D=3D DRM_FORMAT_MOD_LINEAR) return true; --=20 2.47.3 From nobody Wed Apr 8 01:18:33 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 8265A374182 for ; Wed, 11 Mar 2026 03:24: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=1773199443; cv=none; b=e1HHXyBewYvFqt2Htp+iuNuI82Q7YFOeH/Infxl0x+lM/uo0mYEgca24k+SQ7IfzTJuYWtMVHRgVetT12d15RejPGSMSpMOqFKyvcu2BUUcK5i5VZEdVgKRWGLXSm1WgSZMVzqA2jJ+mKtEoPwpmfD3zVSv05cQoOgfTwpGeUgA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199443; c=relaxed/simple; bh=jQr7R3+YepKvgcTe6jp82KzUXB8bK1KOSbD7btdKNGs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=X3YsmzMQ0sDe9E4a6n+nIjxz3clJZofRjLrxYJsobRBnNDeRP/hl7ZO2m0n2kx8Beu5tokoNJZQZlCVCf0Annjp/uuw1ptovl/7NcUOz11+eoLUT8ikPT2Y6HqNuzirxcE7t+sBY7+7hF9/9nFNWPrm+uoIAdODXo8mVBVR2oIM= 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=VebJrlru; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=IkJ1+brr; 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="VebJrlru"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="IkJ1+brr" 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 62B36N4H1573018 for ; Wed, 11 Mar 2026 03:24: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= YzMnkl155rfInvEKL9ifI6QydBewp39sV6azipPoMOc=; b=VebJrlruRM4RJj7Y KoHO2AgYGh+98lC4YqPurKT1a2Kk36loeY2ZF5AMGo3YzemtkKyAcpc9INS8YQMN t6Zui5JxiOOAbiU6qbkugtpwW7UH8f1QKi+a11JldSbOQJOjHxyV7b+CuspJ1k8d Zl1N0MjruWQjVU9HvEQbYUScM4FCUoJFCAd375EWKPYxME1aWoSpMJz+jIe5ffe1 42xMJOp3dfl9jdf4RuaH2TKRTQvDLt5BZkCjZyU+aDdyyi4hRaIwiAXIC+0tMaj7 cxICBYuSmrWNhuEIjElXnfxBEtOSZW/nimmxMvwUal69OTIeTU8a1LOioCrT5wk8 E2BnYg== Received: from mail-vs1-f72.google.com (mail-vs1-f72.google.com [209.85.217.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctqgk9rbd-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:24:01 +0000 (GMT) Received: by mail-vs1-f72.google.com with SMTP id ada2fe7eead31-5ffbbf0e3easo7446090137.2 for ; Tue, 10 Mar 2026 20:24:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199440; x=1773804240; 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=YzMnkl155rfInvEKL9ifI6QydBewp39sV6azipPoMOc=; b=IkJ1+brrH5ODEFg9nvQ6JYOfx4iQRcpauYdzfZxK+vZEoy1on2CTerQ6KvgjoQSk+o xRt+zOis6mmyyZ1oeLdHOA4VNVcJyWLSjmAzxnKBWxcZHlsTem+QUOSWbaWDMUM7p9gb V6VOVn+0T/J7grNLLt42uBCwASqIrueQitJ1LQAFvIOJPLoguLy3Lj7IEzsSIUBCYoNr kcuJyPVbYKo6k6IukU8MFs40/gTTuvkiBgERiIiTrrWm7zuOqssh33oGzNBxboVchAZv nswYw5toW7B/K93BfQhqQYIjVPZkY1K/mNrrrDdn2ndo31BqPxjDpfoB+LJyafsveAdv aRfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199440; x=1773804240; 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=YzMnkl155rfInvEKL9ifI6QydBewp39sV6azipPoMOc=; b=VwuR/TaopZIB+MEu8aEUgXmQKAlKh/QjUXhY0HzY7pPJqf5J0Oc/Gy7UgxMlAaAYet z6KW3IbEruVHEqTdGwIdkiC7HA9VRhxaIgZhv9hwMz+AexUXKT+lJiLAJ/KjM5YdS/l3 S7/PVHcggL6i2pV/Dx9DuCQ0FrZfv7VQ+SUdzuJ+SahfUFWdudghXt7CSAf9rKQRGRGa dTvtALMEVgqqdUdj8JXNDJDqtHj8XKT5AtxhGogpQZ0FzgiWv89oKfv9rw6SSAofMziZ /ke0Vwm2ZUPcTOLz8SlLCCULPgTbu1H+ir3xcxsG3o+1AdXnhGn2xH/Q6CLizDbov2Ba VZ4w== X-Forwarded-Encrypted: i=1; AJvYcCVUzeZPY1gorNv5rqsxromOAH1kf4jCfKb0zkCntTzifztEIlF9AOCJaYyZpOJVgKUHeR0JxQmtFabUUdQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwBntRvq2tpjFkpMil3b7KDsJ3U5CTiFuLGAMoR4l+FlythVZIj w5By8K88iGWXUQRTi/jTqw0U7n2B6IlQoUWSOnO94ua95EitVc0/MpVu1fxiumThMk1J99SD4RZ xYoaHRsiPYfv2vo+a4FnB/0BtCxHE2RZXtGPZaTKL1Y9FHCBGjOgok0r4aU0Gidn3diu15h9VTX o= X-Gm-Gg: ATEYQzxwFGVCidLCmsbE1QgrlMcV46jHYr9DnrNp/K1jHUlRVc71nWdQfcFp3gcdgzH YUGpoCSG79Othg+xnlUN0n9WbtqCPUZb0ofb3N9TqeqFeBSj+cZmT2Je87U9QuaWTzR2UpYQS/d qrKyfoor3WVYg0PEiBmaFgvOQSp/qCpsyX1M7ZzFM222hIANzz1ZrTlXYhx1mzyqXLheoN2Zl1r GaPuPQny7SrROzRt8NNcyCQuHDT46/9QgtouqUkbiCqFvE9ryB78rWguy0D5CU8Vbp8vPKTM+Cv t/LlFbYELZ+xeWMs3LfFmBcEQq6F0fHVoqQc8O8VCzedmOc7udsS3Zf/dmeerX2SqhVRJ+WYv+X qMRg9+Zx4og5jKLIsAJLfhq/G/1AKDsfXRLFJUeDBQBPmFk92v1yjpaDkEMP1pGx284zWsn/M3n G5TlAzdLL+rHCkKTiwnS6jOy1i+bEZH3SxD5w= X-Received: by 2002:a05:6102:d89:b0:5f5:773f:b1e3 with SMTP id ada2fe7eead31-601debb903cmr367923137.11.1773199439548; Tue, 10 Mar 2026 20:23:59 -0700 (PDT) X-Received: by 2002:a05:6102:d89:b0:5f5:773f:b1e3 with SMTP id ada2fe7eead31-601debb903cmr367909137.11.1773199439138; Tue, 10 Mar 2026 20:23:59 -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.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:23:58 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:23:10 +0200 Subject: [PATCH v2 16/25] drm/msm/adreno: adapt for UBWC 3.1 support 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: <20260311-ubwc-rework-v2-16-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, Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=744; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=jQr7R3+YepKvgcTe6jp82KzUXB8bK1KOSbD7btdKNGs=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsOAf2yL1+3Ms4JuzlF3f+lez0I4Jq2l3wXVyl M7LMTfVBymJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabDgHwAKCRCLPIo+Aiko 1exIB/4pNQtbZA7TTqXgzxpx1Kd2zIcePocR0Xp9xUwllg4Nfdmt02e4HCXiyAMVMbE4u+Oy/Xd wkE5Irxu4m6NrJDNka/zzKiL4u4UQ0S32KM/w7yhm3GdG5hhGkONcbbfVUZTyVPrkp/EqHQvr+1 9bTKpYVdlBYY15OBMoNRatJAMS/lKY/iDhOumwm+Ig6jWun7Mqc4+irAFXc75ocemHWzyDNP2sY v1jCnSxfy1mvPtTN1tFQeawTGQYeqvWjbUf1oijSsLMpAZVW2TAQ18EjgsGkTNZhVAb7sZ1s4NY NGD1AchUG0YY6wNEG5AhLzyeW+py3ZkE2G1tv1QdA1k6GuTP X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: PtlIQaTsjIqL5kFoKiDt9ZTE29KPRmEv X-Proofpoint-ORIG-GUID: PtlIQaTsjIqL5kFoKiDt9ZTE29KPRmEv X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfXyIyfb2kzQzMZ c+r6gCRqV7exzyrB/sqFdFWMYL9Ka093vDQ4LYHYA7s/OAQfW7t0qejrBs6PP+3Vrc3kckiDTlO TBz6xbifRH2WMvIU0Y5x3yrjbNuUxKFzphvddMx91UaUZOYRrxdukivlNG+GAQioR/+h5vSOtx8 uaFBtXEooxBgW0lJxaq4xLVZZ2Sh+5K2mLGaAYuFQ1/P5rC0lgwRTiHLPnchbwE0hhc9fvQYaYC 0zoXbCanx0pUw9pFzq4TGo0RGlEf4GQ9QsnnBmtVCxSGZYnhecE4q52UhzQIltOBUv3w8c3efAH YN4M4O2tHw2CodAZPvDKxoyjS2k8jUMEyq7A0FzjFjZu8eMJre3nE+S+rXnvI5kIjht45ZQOwin fF5eK6/rPdiqeN2RycWkFvo9ACxiDHc8P1PKNaYqB0C4TjzpU54cWm3E2NEaF3G629CCShwu0Ok M9zKnKD+Gxa89Y14oNg== X-Authority-Analysis: v=2.4 cv=M4JA6iws c=1 sm=1 tr=0 ts=69b0e051 cx=c_pps a=DUEm7b3gzWu7BqY5nP7+9g==: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=h0EdKdWjJzRczO_IdhYA:9 a=QEXdDO2ut3YA:10 a=-aSRE8QhW-JAV6biHavz: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 Extend the driver to handle UBWC 3.1 (in the same way as we handle UBWC 3.0). Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a8xx_gpu.c index 680f0b1803a1..45f260db729f 100644 --- a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a8xx_gpu.c @@ -289,6 +289,7 @@ static void a8xx_set_ubwc_config(struct msm_gpu *gpu) fp16compoptdis =3D true; rgba8888_lossless =3D true; break; + case UBWC_3_1: case UBWC_3_0: amsbc =3D true; break; --=20 2.47.3 From nobody Wed Apr 8 01:18:33 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 B06223750AA for ; Wed, 11 Mar 2026 03:24: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=1773199444; cv=none; b=LY8SB5wgwrZmJX2UPL+8DE8sbEmphRQBwytXCISUDhj6KCnh8/1MQXCPPzJCWDODu3sV5JXpSrq7WFSpLLZWrapyyPLEXHy8151mGzH9wxFraE40t68um9bUGV/GyXOfxrsopPlP6ojNUTKdtHtE38iUJoN1BZt7VARIu5fMYyk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199444; c=relaxed/simple; bh=Met5TZNVp13sok3oQ5iow5YoFyI1888iL0OQn7nMGcE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XdV9t5qKigds91CXwLw8e0wtKW8sVuUqJPV6c0R2wztGuBdXJKm8+bsIREr7qG8cRLzyU1pZkwzxUG/HTSQoQS0K2qoEzQsj4CMqVHkNABajon0X3VPlFIuHfaXQmPDDR/R9ghsEh9WcqzjoqdPy9YkXhgnUc3eaGvj+RnF6AU0= 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=DZMJGc3l; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=YgnHgGiO; 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="DZMJGc3l"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="YgnHgGiO" 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 62B3BINQ2179445 for ; Wed, 11 Mar 2026 03:24: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= 2yYkLoxCfripsbdwJQ9JG6vK5PUaKJ8D9t+Ub7ZuELk=; b=DZMJGc3lGwiPaLfo 5hMUdkJG+9lAs0miqwVlg90vuWwLdN2ngXvUi+FeqkbLkoZOqs/bZvlsPPRPzgwb D3XGz6tQh89xOQYY2pQBqEWf20yH2O60W3ODFN7RdVxzjjnUZvvkuMahZuUGP9wk 4r88sv0jzkUY2/65ssw301AsCoQKQUdgEUWO3bDDWDYrQxnOCeRJ0g34pZiQ7FXH qJ58zb3oK3nbWn80SOq+kIiO/ZT8NskjuH6awK5mPqOd1WHyEcCX586/yl5zH3Sc RHo6ssIbcH8u4b5p1rjtGWeU1pBh+PN6xEn9FpuV8apJxgkXfIebrI8e/IHdaYQ8 soqmsQ== Received: from mail-ua1-f69.google.com (mail-ua1-f69.google.com [209.85.222.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctqvsspda-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:24:01 +0000 (GMT) Received: by mail-ua1-f69.google.com with SMTP id a1e0cc1a2514c-94eb4245732so2811984241.3 for ; Tue, 10 Mar 2026 20:24:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199441; x=1773804241; 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=2yYkLoxCfripsbdwJQ9JG6vK5PUaKJ8D9t+Ub7ZuELk=; b=YgnHgGiOMrUmbdXYK4izGVg7qwmitOeJwSVPutsK1fsEQk5c1U86qam3ZDvMgwPB+p 1R6RM5mqLA8sZRQvB7hnCIaHEcauF363NWa5bkyyaEvnbL6EAE8RVi4VR2N7kV+SoOzY wWDKOy/eV21GQAXLjEfzjtqqjUzni4BXxwsYjrg/glA9fVTv10Ngc69hY8TBat/t4Z87 gsQ8srHms+PiWFy8wC3tH9/A1kVGyhDwCcjHTS/e9ExXL+TJ/OE4pJrJ3gtTP4xShaqe pXa22F9wfQV/EHT7zCvJiURs3MliIgvrVOa8xjiTpGI0N3uW7NZgb4e8KD7QrqcvCKin 8XxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199441; x=1773804241; 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=2yYkLoxCfripsbdwJQ9JG6vK5PUaKJ8D9t+Ub7ZuELk=; b=f+odMzyz4Ne9GW3/V7K7M/n33Auta2fyId7fFOQaLt8hIWkzL7OhkAx5CI1UDM007z 30WObESUrp0HZ/Gs4rhT1HKSP9gFSrMUP3qE81zZgcRXXmKjbLEoMVAD9hN0GKDCooBa ff/oyGih6ClR05M6y6snrF/CK1tAciXk+t9WpvnuMtfhRgJEat8iUGYiWfPRX06pwFKR olNQ5cbczB9yWn6YD1pVrCjcXgUWBPBpa6kBhWWQiwYIA19exAHfDn8TzdB7z2PqBSQ5 nBkXPwJfD1vK9u73hMsLvUXW4tjXZj8cjhM6T0wzbBdbEhCP4wBbZvrg60KSwnBPRyHm OUuw== X-Forwarded-Encrypted: i=1; AJvYcCVSoG+0dEb9xeFVXZ6T4ib5WKdGWp2rDGw8sjR0gaYrPFV3UHEYDjndNGyPBjynW0GluUuTskGGf3p+7MM=@vger.kernel.org X-Gm-Message-State: AOJu0YzjCkfQaNGDyD3xzyYesva+nN5CL2BAW/tWIQ6409CKq0HtXTX/ uD8ndyrJeSvv+UFgWAFqKgdGo9Hlkw73OWBasWg/DHtO2tALyI6qCv36YwjQj5rBN5rsZE3Lc7n /rCGOkJpke/g/Y1bzcMENJJ6j22Bk1zu0acLuaXql31ctHlI447mAh6Da9xDkdhNuRWI= X-Gm-Gg: ATEYQzzaFXizGbEHD7iDPtcudZkHBniYPgSpAFFDQsr7wRQ+tLdLSSOmTc+2b4vaZCc IPhcgxNU12is2WMYHV+Bt79mxy5lJo13zQI2+g49r1DtGPGgbUFL5pFC5O7dOZQ5UQkQfBKKufJ 0n8J4qnjznk05Rf1Ath1fuDDo+jkB7mTkzofsSY3zlzArt8MUQtg4Ks9SjpEUVQuFzrvgFZKaDl Vjo9MsdE9A0AXZdKztvbLtAafmQ15jRjer0Hg+kOZUzE3AzVbo/3xte/DSFFpKb84N16CsvCfUM 7LCoBZn6jDb3Vqmc1jFUfEQHcZ/goAXRbe9hFDtqjSVARyKB/cZxxtkETtSMJIbYy0AEcpu+48Y YqS9djlnlK2cGDoB9iTUzrAkblu8lxJ6Xje8w78hTAYqSzw9LYV++1982HaV7NyggXUsHiHzHt6 WwJZ+UU0YoGyBUV51NbCiKeWGKPHVE5GIEJIY= X-Received: by 2002:a05:6102:32d3:b0:5f5:5925:defb with SMTP id ada2fe7eead31-601deb937dcmr386194137.10.1773199441064; Tue, 10 Mar 2026 20:24:01 -0700 (PDT) X-Received: by 2002:a05:6102:32d3:b0:5f5:5925:defb with SMTP id ada2fe7eead31-601deb937dcmr386174137.10.1773199440611; Tue, 10 Mar 2026 20:24:00 -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.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:23:59 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:23:11 +0200 Subject: [PATCH v2 17/25] drm/msm/mdss: adapt for UBWC 3.1 support 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: <20260311-ubwc-rework-v2-17-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, Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=949; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=Met5TZNVp13sok3oQ5iow5YoFyI1888iL0OQn7nMGcE=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsOAfH/fBkd/4pYO0rbFbNER/KkKakw/fWGb+r TMgTNyIijyJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabDgHwAKCRCLPIo+Aiko 1SlSCACv2PrRr+4728piITElTpbl8PMQ+h09EM6weyT6/zNxwOcAEYAxnC56pTOEktWidE5aL7q bAhCYVAPrhs2qe5pxH8EBRmxYxN2+zXsL0XEIJ1zGKICXAdfW70DSw515j5KNjemts/bDv/WBsa EnCeHf/Toa0CSeDgWv1txuBcQcaJrfQ9RRy1c9/58oMgfEwonfwqfyHHhTkGq7BuCtOqegH23z7 qn2mL3cUfd54zpcKORloffBIFo3S98Gdx/e+Tl2UzTxsD9/ZkqvDEq1S7To8oR+Ds+kkf4wyQbm JynE/VbqIM7H575fsCGuhmQQw2QEp379l+9ejPdcXfxux/Pt X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfX2QJ9BuaAbNh0 ZqsU+SFqSqrqtnEdb5nIzwN26Yt9YG3Lm8CyxnTCvgeLCi2LP5LrGNgzzwJObOKCqgLIVRvZ8A0 yrapgG65NjiLVxnh9f5yd1xOzsERFkz7HRlLVYJ0iD3OyrE4X511d/39tGcdDr4sh89USZM3vsZ dfj8PF0c+mEiTd9IO+dOR96+P3DpQdyKdnY8Pcj3PhE9487NuxUQreALn9eWFT811udUTO5J6Xu LblZGRO2xWB5jxzm1MWh14wCHJ3x5OvllDFsyKh1GsMJ2uWKrlm1Ai3geke8KcNoiCKws4E6O78 Q30YPU1NxyqEZzesKdeQiqVmWNqJzc+hA1lkjq82vy7yH1rQ5e4fCOwDOixA22nTnPUtqGpFBrp u73NJ+gGF7Wx7ksu6nL+Gz2WmX1FU+JR/q4N+OmpjJWFVOjr/y+wC1QL3uCvbZTJ8BlAjwdSlrc kWDyZP6fLUuUfdAEakQ== X-Proofpoint-ORIG-GUID: AXJFM9HulUek5AtR1krZoDc1ppgE7QxT X-Authority-Analysis: v=2.4 cv=Lo2fC3dc c=1 sm=1 tr=0 ts=69b0e051 cx=c_pps a=UbhLPJ621ZpgOD2l3yZY1w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=ou6ODICaiX18ouMgCewA:9 a=QEXdDO2ut3YA:10 a=TOPH6uDL9cOC6tEoww4z:22 X-Proofpoint-GUID: AXJFM9HulUek5AtR1krZoDc1ppgE7QxT 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 priorityscore=1501 clxscore=1015 impostorscore=0 bulkscore=0 malwarescore=0 phishscore=0 lowpriorityscore=0 adultscore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110026 Extend the driver to handle UBWC 3.1 (in the same way as we handle UBWC 3.0). Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/msm_mdss.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c index 0b15d725566c..6cf391facffb 100644 --- a/drivers/gpu/drm/msm/msm_mdss.c +++ b/drivers/gpu/drm/msm/msm_mdss.c @@ -190,7 +190,8 @@ static void msm_mdss_5x_setup_ubwc(struct msm_mdss *msm= _mdss) if (qcom_ubwc_macrotile_mode(data)) value |=3D MDSS_UBWC_STATIC_MACROTILE_MODE; =20 - if (data->ubwc_enc_version =3D=3D UBWC_3_0) + if (data->ubwc_enc_version =3D=3D UBWC_3_0 || + data->ubwc_enc_version =3D=3D UBWC_3_1) value |=3D MDSS_UBWC_STATIC_UBWC_AMSBC; =20 value |=3D MDSS_UBWC_STATIC_UBWC_MIN_ACC_LEN(qcom_ubwc_min_acc_length_64b= (data)); --=20 2.47.3 From nobody Wed Apr 8 01:18:33 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 4517E371889 for ; Wed, 11 Mar 2026 03:24:05 +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=1773199446; cv=none; b=YCRZfWlyrpSMx+Xy4sQ7+R30cUjaQ8rK58cK6G/9nJ+buigGgYzEPZG+gG+9z59YJV0739b9M7cOGw6ql2Dn/NUviRFqaB1roe1SRv1+QsPF3amTtS4Zb2cByK4z5Vi/GMJmF+W+NNEviiMr5L04KPeyHHz5kQG7lM+5YvhQmYk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199446; c=relaxed/simple; bh=z4RQ2542mdKmT7Il7PrHpeGFC5QNfj01HavCYOFO0fw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Di8tF1HAEVYVyNKuNgf7CSAqZvx2L/pL9DlgA7o86e5jrOwsqVrfMTCZ0YNELbSywLw3g+IVHjtNYXL/BzMsUVo2TxQJABtVs49oEH7Xo1S4C+V6DRAf/hecDrOq7bdee+eddiKp6j2g5CLkQ3RG4EB+wkFgJBjyHX+UyamIdeA= 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=Noa8luIz; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=ZuSVfmkY; 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="Noa8luIz"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="ZuSVfmkY" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62ANoIBD145085 for ; Wed, 11 Mar 2026 03:24:04 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= M38kDb4qB9NXYQ+LHNR5zTGrfaGpw+7+YITovw8Gl8A=; b=Noa8luIzcFT1At9I FnV7rPMMC+CRboIFcSDn5QsCnzzUxpmjgS4gfaHMGVwwZGbVAwN2nGZPtzleL4hi 2BeeTTYXyIrIJDADJWCgnNFxci7BbPazmDwkE6L8PDX22SgKgD0nkJFIpyHeaJ66 y0thpT5mteMoKP9gwPSHx9LNNcXAwAJsr3tRPTTMmhGj+6LcjsPEjppygGmRczTN 9IVsoqI76eaexJTx30w47lStuHCfkicn0vAamR+m4oUaprsKtw6n0uM8E6trH3kj qKiLcLTXYm9PVNnpHBr/ilPiiRIo0Zm3svpqZ+VtrI0JIObRjsqjRffaxG81NXlQ 4oVN2g== Received: from mail-ua1-f70.google.com (mail-ua1-f70.google.com [209.85.222.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctwav8h7u-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:24:04 +0000 (GMT) Received: by mail-ua1-f70.google.com with SMTP id a1e0cc1a2514c-94e9c0edfcfso33078080241.0 for ; Tue, 10 Mar 2026 20:24:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199444; x=1773804244; 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=M38kDb4qB9NXYQ+LHNR5zTGrfaGpw+7+YITovw8Gl8A=; b=ZuSVfmkYIBdAFi6PKiNoq6fjVtlzw3+imo7I3TCUAIcWV6myQ1m37wik5L+ivkiiUK 4kv9zIHALHlxTadA8lfEvRKf7Xo2GhyshXivKX9uGJ7h46MdDb8+b6YIZOTbzmhjVAFZ OZWOloCDGY0oeF2avdwhvNVRZi0JG/p9obeDdv0KsK8mGvQjQXfhO3IfvlRawfY7EG7E nyZFQ3SvbEDoFd+Mx0dekQxQarvspd+VoCEpQEqTaW3gQOwqiQQKtKTOitAPPufjsAQb AvNEK2tMiIm+6DCpGSyIbTvfQavYg87fIzRD/LL5ShDGehSvt5mjaU3hRVhDtNpzFWyl 4bjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199444; x=1773804244; 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=M38kDb4qB9NXYQ+LHNR5zTGrfaGpw+7+YITovw8Gl8A=; b=I2UzNbnSczMz5VBaqFA8/VzFYlVWeCTTR1TvUAGG8VAx5bJ5svRTyL25Q7EVskm+py D73fSIU80hEZR/qDS82/Ld7+8O4pt/WIC2kSCOXYG5q+J1kLTp9yoKdz5XmXrCGZG//4 RQ1WpruXzsEC+X+cDFs4vDeA9YemgcTj2YWgsW9j8G6NaoDn7Wwo0dRUJN4tj7zPgvHQ U+qYPHNA0M0YNA1zHkMKGKNhboEkAcz7tBXR90Dm2MRpL0o6VXpAemEKD4dheCrKNlMu 9yibkfcsh7q+zSIBtJ81n1E4KzNg6AGm71UoumUNIkzfh8pBhdNhlKLPLocmIlwQHn/d YO+A== X-Forwarded-Encrypted: i=1; AJvYcCVqF4MyLW6LkR38lVGc+1y52r1dCziZe7yKmevfU1yzlbaXK7xtDl2ccZ2RCG2tL/MUFb8NE1pzIpVeFqg=@vger.kernel.org X-Gm-Message-State: AOJu0Yxhu9vPyNTYj4a9N3xNsDbYkXVI4b/kWI9tYsar9Fmg6rnPZQaC woOrZZCRVwq2YzaUY/PIdxxuzDt5EEMr4nIYLLOBD49ELr+qLdMaUigV1Lg6muPYbODDWfeVwWR ptHuN0NXIZ8bb6LkMZvqkYqYPKJr4s/+q5bbi9hzpCfEpOBiwiPZw5DEe3vJeo6DBfY0= X-Gm-Gg: ATEYQzwV1o7Xy3C58za4XWSFUcINxUFUbmlvu20bomPJvWZPtpsC199FJN2ir/a1qY2 4XFIYkvabdQ0WfBsbEv6YxoMzsrErUoxoR7c+WTpbiNrGft5YvBFuzg1vCCWECPZQAXiX+xgSFY UDH3kW7IcnIyE0olMsXP3ff97ZtgJPbH2maUMX49fstTwdNbHteuk93666q9Iu1zhjIylBDnmHH eDab29BE9yAt+pliI9WUlmlYk6gcJKxyFN6UiustkE+O1+G5KYfk0q2Vri/tJ2uSCm6vwcSBVSu EyfOQH/CaSD+ugBSDf/aJmXcvw2gKeFk0Mhz7eIk0gMxAjagvLBBqvgmS0USVvSZWoEjt1OSlVx DlHLB+A1gcsFqESt6rkzo4a3I6mhBtq0Ub1nIRnrmO4gm54OhTf92AZs760cmioz56tJWXpW2zm Emnv4zntBOQsAuBamnkmIuvljzNNMAGW/Vm0Y= X-Received: by 2002:a05:6102:c8f:b0:5f7:24e9:ece2 with SMTP id ada2fe7eead31-601defa4eb6mr521397137.28.1773199443670; Tue, 10 Mar 2026 20:24:03 -0700 (PDT) X-Received: by 2002:a05:6102:c8f:b0:5f7:24e9:ece2 with SMTP id ada2fe7eead31-601defa4eb6mr521385137.28.1773199443255; Tue, 10 Mar 2026 20:24:03 -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.24.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:24:02 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:23:12 +0200 Subject: [PATCH v2 18/25] drm/msm/dpu: adapt for UBWC 3.1 support 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: <20260311-ubwc-rework-v2-18-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, Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1214; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=z4RQ2542mdKmT7Il7PrHpeGFC5QNfj01HavCYOFO0fw=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsOAflWjN4izX4SqVd9rn6j6krJXFuSY4SL4IF gEpYBJPalaJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabDgHwAKCRCLPIo+Aiko 1ZfCB/9dnS4sDKhuaQOiiic+SvhyaDzbb0irFe7XRCHXGrYStulh8swHtQW3jZpluiXTyr8s4s2 CzWyQtzWTfqR6dgtvq8s44/BvgB1rlTj3CroiNb/PxhjWJAYy52b3E3So3pt6246Hyx5j/lBrZV xoagAwN1/FEimGiJ3u3b8bZP0t0cWWTo7Zt6r03qTQKYeAKw4FZTPRUV2EjPLf3h2SamvMYqX/I kyrOGIWzuQXkwLpBMf8ME8AfXs91xliaLOYlDZOsfFfyhv0zUzy/PaY8XfhYZcb7+AxwYySUqFW tEZYPlcoDqb5syb4U7SFqYu+WUgvQqfx/qLOUfkcT6BTHF+6 X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfX3MHydep/3J7V ppST4iqCxFj9awR3mees+uETT5+yha26yT5fqt3/5GvF9dO6pSl4eCgt5y9Yr3tS8SjXEmA3AzX oNuxG6XafdVc32H6X6jsWWLPSkdFcYGbwTBtnSgrgk/uvnupgDyhji+IEGt3i5+I4Zl3bPy+HYp DobYEzGZJIjMLVOMOSo95etXSHtL5lyV2zBAt9jhlzB/4BW4Au3JWKi4HFcpKGvFED2PmWKOlWP PBOMCcKyJ2n+8fQHPuIfyEPNBquvd94trA7Ly5YCBR5KFmwpiXRE/wyu11Fl8R/X6q4qn59Vbxs cQ5LtE3te13vu3jD5BSEm27aUtQV9hv3yQyAFMhM32+dEKyKd0VZwErV6yllF+VInlcWua3/JLq dgv3cFrl46le34NgLbya3KrQG/6rsjgrKjeIr89umDA5MIy5l2sdLS66Xs2ipdYDnpJABsW3iI9 hz9XaHY9TwuM3d3M/Pw== X-Proofpoint-GUID: rLlJdrTr0Jo8aKL8Tpl-fBer7cFct9JI X-Authority-Analysis: v=2.4 cv=K/Yv3iWI c=1 sm=1 tr=0 ts=69b0e054 cx=c_pps a=R6oCqFB+Yf/t2GF8e0/dFg==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=EUspDBNiAAAA:8 a=2jSDvX-ur01rGIY0dUYA:9 a=QEXdDO2ut3YA:10 a=TD8TdBvy0hsOASGTdmB-:22 X-Proofpoint-ORIG-GUID: rLlJdrTr0Jo8aKL8Tpl-fBer7cFct9JI 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 phishscore=0 impostorscore=0 malwarescore=0 spamscore=0 bulkscore=0 lowpriorityscore=0 suspectscore=0 adultscore=0 clxscore=1015 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110026 Extend the driver to handle UBWC 3.1 (in the same way as we handle UBWC 3.0). Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c b/drivers/gpu/drm/= msm/disp/dpu1/dpu_hw_sspp.c index 6089a58074ac..cb06db3cb367 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c @@ -324,7 +324,8 @@ void dpu_hw_setup_format_impl(struct dpu_sw_pipe *pipe,= const struct msm_format } else if (ctx->ubwc->ubwc_enc_version =3D=3D UBWC_2_0) { fast_clear =3D fmt->alpha_enable ? BIT(31) : 0; ctrl_val =3D fast_clear | qcom_ubwc_swizzle(ctx->ubwc) | (hbb << 4); - } else if (ctx->ubwc->ubwc_enc_version =3D=3D UBWC_3_0) { + } else if (ctx->ubwc->ubwc_enc_version =3D=3D UBWC_3_0 || + ctx->ubwc->ubwc_enc_version =3D=3D UBWC_3_1) { ctrl_val =3D BIT(30) | qcom_ubwc_swizzle(ctx->ubwc) | (hbb << 4); } else if (ctx->ubwc->ubwc_enc_version =3D=3D UBWC_4_0) { ctrl_val =3D MSM_FORMAT_IS_YUV(fmt) ? 0 : BIT(30); --=20 2.47.3 From nobody Wed Apr 8 01:18:33 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 66881377542 for ; Wed, 11 Mar 2026 03:24:08 +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=1773199449; cv=none; b=njMmzQgoZ21XylRiiLw7jAZiFDlhBEcziVXPQ/uiil3gUa29xPi7omBNTo/BiY1oFcaiNEFCJIDzEUm1/KmLmtADWijlCIq+9VuRk77PmntrNNps5dGwb63o8M7JJppw7r1clKRyxySV8nyW3eOU59lZE0BaMTI8Pp1rob2xusQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199449; c=relaxed/simple; bh=2LnoPNi3lG29ZP56cipc86DccHTmRuMtPFNBgsiCAGI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uG7lGQU+iobamyMUY7IOhXGu9Eu6rEcUYtZLCibWSseTz45/zMrkg3olqZQZjStAF61uew1qeiOY3YUlzKrjRqVhsnpc3EAN+E1obGVGkPs9fwjDqpAKpCDo3iCizUqyi8nueCgcc9fQNCxWWnXoHoDeLi8tgfo4gGgwJPhaI54= 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=kmN/Ff8E; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=EZB0yePS; 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="kmN/Ff8E"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="EZB0yePS" 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 62AInfnr3417140 for ; Wed, 11 Mar 2026 03:24:07 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= nBxlchdjbjF0eiY4KPqTod21EA8PMrHUqOAvrBh9nVA=; b=kmN/Ff8EdVMHnIPB 0p3G0bbz1BO1wg4uHDoDAGsebhfv2bO5dATQZ37aUt71Gjlja644yOObHO/JDQgo fSUIhoukfUU13WYvMqNbhidNXHUmFscol2fFy/wnrdLQtNAp1Gb1gle2+eL08sec 1hYO7bIG2RAreFFaLMzW3uRLxVjiH/LP390frhzqNr+H50UGRfsBbORCsWKNtn5v sj4TJ+vahI6/yLvfOFJUWWEWMI6lXGsNxrXSzhaJouLu+ijT5nX9J7JmV9XBnPHh 2Uy8T3h4z83sf0da2BL+8Fh1iLk512Fjnd2xPyVkeZ5MS7ZhmVCwbpGTRewqKUty sXPNow== Received: from mail-vs1-f72.google.com (mail-vs1-f72.google.com [209.85.217.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctja2b63t-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:24:07 +0000 (GMT) Received: by mail-vs1-f72.google.com with SMTP id ada2fe7eead31-5ff9f727641so9060041137.0 for ; Tue, 10 Mar 2026 20:24:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199447; x=1773804247; 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=nBxlchdjbjF0eiY4KPqTod21EA8PMrHUqOAvrBh9nVA=; b=EZB0yePS+wiYnVeZnpoa8qyOvboS/V2DXJ2BA4JvLt9bb2ihvLx6+G+/STj0gUyFtt hft69pqVGbXXnWSxHa6i5iWE11rV+eYK5Aukulwa88GO8KxahRejrPczl5Bq3L4joTRN X90nBh/WHYi6Yn/FvzKtrIvQohTKYAV0iiinCJ5tYHy4sEM+K46Lq8J6zeE2gctM+Tay EyFZCzuCHmYzRFdkbgM+N8WlEgoAk9jCip7k4UpcgEe5BTPMrBXJyv7ziBGaWUwMGGCm PxHUzNusutQn6U4c6Ueox6SC5QsHHeRWILUJYkD52giZIwEz+3qBx0mQ3umotUPkhbTU eJ/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199447; x=1773804247; 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=nBxlchdjbjF0eiY4KPqTod21EA8PMrHUqOAvrBh9nVA=; b=bK+EDS5TZUGKLWUVjKVCF5OEeoFRS9g267SJHQ6bjHEAxXVUvzNRju3pt2j4OgutJo sFg5u8D1KBhT6rSHTZ8BdGtLjiipljh9vKsKS9BiqBbK10kORRPY7daWPTsEBb/wnukX XtJk8AGmbTtmsS7uDDQhQepqxO+t+I08cqjUQgxZPhXwPByccztwc2utjPi06ilGzjnQ B11v33DfWnMot3XKV+KvkgGM76Vi34PomHWaFC67D0EbyJn1oBem2r5QWH16tTR2Fy6/ 781ONwGk1Ph6rj5AvS7kEfQ9+DTaOzSKLI2QYcXz+Y6WFUHjtSmC1l+ckAIt93TMS5NW OphA== X-Forwarded-Encrypted: i=1; AJvYcCUN/bhpyC8kk7arVcVVnfAwPnVsDdbHPVJYWxb3iKFSHv2Zn+d95dBHYdrnUSE/u9/AXFsmK+Hk517zqi4=@vger.kernel.org X-Gm-Message-State: AOJu0YzNfKxC0jlmtXn5mtLe279aq71NfBA7wJHc3qnzCzcQQw1zFdzX uzejKa7jmXP0pZhir6oawPBifHyTX33xSDdj52r1JeDY+ESqy09nor4OvFnxW+6Alxxa//G7s38 U2HmY3Q1NbYDkIbCRPGuslxWKmbuuVSBNzRwIoXTEGlaYAJ9Nte2PMSTr41IR7CaxqI4= X-Gm-Gg: ATEYQzwtgv9Vjk+hI1ZKL8mjWOXS1jfASJiuoDZqlQranzxVpMsNPNaR/5qlRn8bjjR rshXf+jnUq/sKMqINldaEy/WnuxWqu2HV906Dzf0LiRcs7muNvgXwtSp00lx7ZMODFAuO57lwYo kju7/+KpEgNvV9i509TtGG71Oadj7xGnIxzLHvcGluC32yn/uFIRS84lsaWM1dZpsKUcEERuoKX tKdq1d1A2qXBT3X971GU1lsyAIEMmy+NatuDbyh+iNrjvFcGDCQEETlQFsXXi4KFPbxEBDZb0O8 Gq3uFSuMjL9/hgaaoaoB3qnK9Otd4Q+cGahlEs+ZUcxjtSvRWMDSjVsUY1ClcLZkI4UVCw5jzaC v5OBR9BKzhTdWYVBiVpJVYOuOeLV59ogfWEmuWkUlFd64J4SZ/z30/5ZFYedV9HxpROo4p7WFnz gM/0yONAQm60oTnyaiknKyW4121slRIOWjL1s= X-Received: by 2002:a05:6102:a48:b0:5ed:928:59a4 with SMTP id ada2fe7eead31-601defd5769mr323854137.39.1773199446751; Tue, 10 Mar 2026 20:24:06 -0700 (PDT) X-Received: by 2002:a05:6102:a48:b0:5ed:928:59a4 with SMTP id ada2fe7eead31-601defd5769mr323844137.39.1773199446320; Tue, 10 Mar 2026 20:24:06 -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.24.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:24:04 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:23:13 +0200 Subject: [PATCH v2 19/25] soc: qcom: ubwc: set min_acc length to 64 for all UBWC 1.0 targets 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: <20260311-ubwc-rework-v2-19-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, Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1362; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=2LnoPNi3lG29ZP56cipc86DccHTmRuMtPFNBgsiCAGI=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsOAg+HPtHKiwg4W6l6e9Z3wiYDXUmHOTOqpeL B9H1xlvsQmJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabDgIAAKCRCLPIo+Aiko 1fe7B/9cV8MvGdvikrcJHRlobcP0BA9wxL53s+ZEa06ubZtuGZlaKgby2sYolzRusTC8Y/XGeWM LnT0ihHJkzXpQukspHnkRtiKyjnmdubZGewnk9zXDcfAHJCR51RmneNLGpn1imE8Z/SZRPXfm27 19hwRxWuPYxnGELhDt4iDy3EJFoyfxhunAswYVAw9ZapA30MMetM3XGN+N6i/K0yHgeKTueacwb b4/vVK3FwLfAsz6NkXji3cmLx3P5n8D9P3XIrdjWzN2goBG1t0PMLFk9z6hbCBVca4DLMuQeGNH oOsRtfFaIEVrp7vnnxmRiE+pR6juZwGUEpcle/tHkXDIOeq3 X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=c9WmgB9l c=1 sm=1 tr=0 ts=69b0e057 cx=c_pps a=DUEm7b3gzWu7BqY5nP7+9g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=5ZsywSmvcCt_NWGkcqUA:9 a=QEXdDO2ut3YA:10 a=-aSRE8QhW-JAV6biHavz:22 X-Proofpoint-ORIG-GUID: hijnH5WwOC415xZJ8sLmd2Kdlqnk3LEi X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfX1KLfrzLiykQ+ mVUkY6TBnAEE0F5wth+Kw/5aijbiTVF4hSBE8G0ypQY43ZUwQHpQdhMZptRsLEr1ZZUmnG/vYsq vpkXWNgqnr3f8qFEE/l6S8eoXmfYEi8EWWTIbubH//15uu73roSDQNk5cuD5TlzEQRecim/UlNo c5PCeXiyHH4n+nby8SUCxixRKdxFEew3vaZcmtWgww8F6ZQS2tEpjuSWIxs13ScYqZ1fB1lx/4p z5mQCLlDCAISTeujrzV2JJiUNAUeRukJlM0R8hmSOha7v6PlrakBuTRlszn2ejHuibFCsEtWDks v5ajqu/UTcWG2D59rJ8nB4ph5xuvCJfMsgA37Bl4dc5vbNmMlZ6v085lX2hoYSB7DX3mXHcBA1+ +Tdfw8o8ItPYLfGBZxi32zjNsEeWuBBIbOwYwoIIpuFYvKuMJ6EXPdiwnj7FKqrp50d8iG8LVKD IckSy4Ql2RC8Tr4AJ7Q== X-Proofpoint-GUID: hijnH5WwOC415xZJ8sLmd2Kdlqnk3LEi 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 adultscore=0 malwarescore=0 lowpriorityscore=0 suspectscore=0 spamscore=0 clxscore=1015 impostorscore=0 phishscore=0 bulkscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110026 According to the documentation, the MAL should be set for all UBWC 1.0 targets, no matter what is the version of the UBWC decoders are present on the device. The helper comes from DPU / GPU world, where there was no separate bit to control MAL before UBWC 2.0. As the helper is now being used by other drivers too, correct the helper to return the correct MAL value (Iris doesn't support UBWC 1.0 devices for now, so there is no changes of the behaviour). Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- include/linux/soc/qcom/ubwc.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/linux/soc/qcom/ubwc.h b/include/linux/soc/qcom/ubwc.h index 8355ffe40f88..ddd7b15d9ff1 100644 --- a/include/linux/soc/qcom/ubwc.h +++ b/include/linux/soc/qcom/ubwc.h @@ -80,9 +80,7 @@ static inline bool qcom_ubwc_get_ubwc_mode(const struct q= com_ubwc_cfg_data *cfg) */ static inline bool qcom_ubwc_min_acc_length_64b(const struct qcom_ubwc_cfg= _data *cfg) { - return cfg->ubwc_enc_version =3D=3D UBWC_1_0 && - (cfg->ubwc_dec_version =3D=3D UBWC_2_0 || - cfg->ubwc_dec_version =3D=3D UBWC_3_0); + return cfg->ubwc_enc_version =3D=3D UBWC_1_0; } =20 static inline bool qcom_ubwc_macrotile_mode(const struct qcom_ubwc_cfg_dat= a *cfg) --=20 2.47.3 From nobody Wed Apr 8 01:18:33 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 26A2C379996 for ; Wed, 11 Mar 2026 03:24:10 +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=1773199453; cv=none; b=E6DzERM8muxXoZgJ5WM5ieJyq1KV2+Oe1BglDywVvw2jFXVETfckP/iCq0csZYv8inIFHpS1UZH2twUw0m2T8jt+/2c0OC/7LDIVrwECwleO24Lkiii6yi/HEadTD0C7zFb84PK2DkqoG3QFYctZjTyR9DgGpj+6TN/jtK3zjuM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199453; c=relaxed/simple; bh=pmFB7F4m9DD9Uhv2va2d9Jn2sdEDdyLf5d6Ucdg28MM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=j2uQwbQFLhqcL1pNSVj4GjhdyB5LLii0XrP9E4vIp7xpv6PZtM3b7yVf1nSuHtTqAVZ6ll5xXHY6QnubABOxtOWdXUvzEVR1n5pRLfGNns623X7MsuK5wMDqOWagzI1Hfwm/vYLjGjUEg8pGwZf9C4OqCTYwH4yGMOifosv9cfY= 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=RF/NaIiv; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Z453ofRG; 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="RF/NaIiv"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Z453ofRG" 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 62B2d3Em2179432 for ; Wed, 11 Mar 2026 03:24:10 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= olgrx1MYjW3M13vKuCKRGX1F1X7ze0A85phYh0ZSsvc=; b=RF/NaIivEoDYx6Ey mOrEITLRrANHo7pP52UJqpTA4jVCbHe0VMgP8IZFpDUZxNxBfoUSJ6Av6/I/uIEh ygOxXMGM4jH+mXk0Vs85EPHB1ax8eeW/4iIN9QcNtVbbU8Oo7ymkrOvXyU5CDWgq qb/t8qN8HvWFInJWXkx2q/5lRc7CMqYZCZN9mWfRoGNs7PK9+ovedEHjavM2lQv8 xmMvniG/kTIbQjxBvtGrgg4JV3SbfCBxp029cVZBqBAwsKuBweCH+gOEGgEdLCY0 CUX1eP4/PGqf9+VRj8s/vzUwEvCGDF1pJce7bhvvt82BBOO49YiYZWzzAtEFw2L9 d2NlAA== Received: from mail-ua1-f70.google.com (mail-ua1-f70.google.com [209.85.222.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctqvsspe0-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:24:10 +0000 (GMT) Received: by mail-ua1-f70.google.com with SMTP id a1e0cc1a2514c-94ea6fdbd28so29109543241.3 for ; Tue, 10 Mar 2026 20:24:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199449; x=1773804249; 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=olgrx1MYjW3M13vKuCKRGX1F1X7ze0A85phYh0ZSsvc=; b=Z453ofRGuZCTkEiLw3eCK3etCCNAqrAYPezZdp7ghFaYOUFyIUnFFycBE+IoZxVbZ0 Gwu0n0jZ7czpyHdryx+Mfzb5u3epq8JKUX0zpOy4lpHnXczIt2tqG3TV76xlq7/Uq6y5 QR0EdFqgVVX+yVpNQnymyg6nE3Fj9FeeQ/AtjBObZaC69fXDUmROvMh7mi3KqliBgy7M sRx8Di992mK+Igb8J2BjCfIVmA0LHv5q+2W/D/i0hp7+E9d1KiH8ywUx07fIFc/hgF6b 82MwZfl9DU0zIg+Ec/HF3tg3tfF2dhWij3Kxl/YQioBJp8xcTiUB2assMly+e61emgAV ry2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199449; x=1773804249; 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=olgrx1MYjW3M13vKuCKRGX1F1X7ze0A85phYh0ZSsvc=; b=Zv/eS36cfRBerIYoV3vBEUvGT21g+Iz7YgWWCAky14PchvuL1Gyi2Bzao5QWxD7nb1 g10lE8orlVNsgYeIBnm1ume2Q31we4u5WXTNuSR3fHQoVnYayX8TSvj6fCcqtfw/paHv 6ES0J6+sHmdxvB6pFVJS+H2JrsBdin2UFGDEVPsZkCHIGJq62uYSxap1daDQ2Oidg/CT smuSYqwoIy/DkF+wroPIw+eopZjPTWZA0ndj31zrL6zWa/fdHfVFqF2HLiWyEHM36CaI m4a5tyLVo+2OU3P5Kc6OVeoXRHLTsMwwywS6r70vEC+XDiQ8vEzo38cUNY89dVfX7d+y FNcA== X-Forwarded-Encrypted: i=1; AJvYcCUiWPJDF6Wr1cd9YkrQrTr1PXd62CCeYKazynUj/wmxhGG1k7QM3MEIkhOdqR8GQQK73UG15JdA4MbR4Sg=@vger.kernel.org X-Gm-Message-State: AOJu0YwFCn2rdr/MAuXbOG4cabxJdGoRd6hBoL9I+np+Y4N7VtbsnJUV dMFVBH1hc2qgFU9/Stbjt7uM+lCoI1377BvaZRCK0SAXiYgIkGb54PGOLEIHMM15vtAexhbvMqh tDaAVZ84CN8v/2j0CGYz5k8rC5Eip1pLqCHZs9KvbRBMV2Ho/telNYugjz+RZmZL3iqk= X-Gm-Gg: ATEYQzzi51k32NO4gYjUMfXld4q3QoWAB+0JxUmpjbDvU1ekmJA2t762C0UaN++siDv vE3YfiKoEDMKFju2PqakBJtCs3xNcEGiCLZTuYONIu00ch7LGyySG5FPpz6ao2gWrhciDmzO1OX dvohFn2q2Qdx6gLcXZ/8nKlqd5w8BvsnhF96lHxXW+BduG1MHAD9ei5YzIpJm/afQEdajvUbKBw RkLfS5rRaLWdfhSvP5k0RlmIQ0y68rcOC/Bk5jyVCuMTeJqbZsfVwbMa9ayOKjRDlieJ4f/0rAq TpZFjte7mteRpn/7hCz8vDYG11uXHeaZdKlLKQkoqOmKspGTZ3LlxcguF6gSu2dTpMN1zdlJLQY PfkNmh87E5qitl5ikuzUxFbV0Dz2RVGIQXoanIk7nvBKzQ+H5ZpgVCSlvDdiWgEjRyCjbY7meIX ZAepPq+JyXQRXNdoCyHj9dxOAe5BGSQdsrqm8= X-Received: by 2002:a05:6102:3713:b0:5ff:fbe4:89d with SMTP id ada2fe7eead31-601deec1819mr483163137.20.1773199449457; Tue, 10 Mar 2026 20:24:09 -0700 (PDT) X-Received: by 2002:a05:6102:3713:b0:5ff:fbe4:89d with SMTP id ada2fe7eead31-601deec1819mr483141137.20.1773199449040; Tue, 10 Mar 2026 20:24:09 -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.24.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:24:08 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:23:14 +0200 Subject: [PATCH v2 20/25] soc: qcom: ubwc: drop ubwc_dec_version 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: <20260311-ubwc-rework-v2-20-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, Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=8046; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=pmFB7F4m9DD9Uhv2va2d9Jn2sdEDdyLf5d6Ucdg28MM=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsOAguIR03+RT9hnEU1tN08Xsime41fwOQZdHc u4pJVZzo8iJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabDgIAAKCRCLPIo+Aiko 1cwPB/9BO2VzYaUF+xNYCNDVqkanNDG1CJ6qnfeTVp1bqz6neRuSaFFIlvLRRtkYy6gCiWcDLH9 mXZbjzcfuyJybP4e0sAS9K+Ve3bsSWJ6DGB1ETskXPlDrGkH7f3XCHscGreI54uZ7vrdr9w/ZsV hYX/NB1qOEuDKTu072pfh576RNsK/anRfNb6k5o1x+z1s7PJKOKZslsq3HFCkTh8rIka4HzwD6u s7Kszt4yzH2tZw7tkqVvvxV/xit8N9z75vWYMZfNXSOLP1njgNBfs6ZyzqUaWCO3JsE1wWmQZp5 Am3ovgomFDFYIo8zSRRQVCG2nbhQBEVQIv+M60fR4kSKXNhX X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfX43LtBF9uY4GM fLgMKiBQ0AKHgrIp4dX7wkhWM5Pcfx7RBCDm2p5R+FiKt4qM9RxdIdflVQf0u66mYwrK18VJ5tJ drtEmVwe4Xb7Fd7HzeVSN2DC0/Ll09bUtuV+E8nz0tuHUdqjDkPzrIkWWOV9C6m7WFMzdRR7RbV 3KA71TC8m1MFcdeRjRqSGi2ag2AbSOnql5hbb0dh6lmqfLBu6oMDfIx9C7HFfrzSrth8DdjdZEF asXZ4LfWssSJ2FwO3C/mk8sQ1UzJBgkNhoQSOUuscJ96NStUrItLzAS5Y7jiD7ETIFel9sz0vXF OOS63sa+AlMXyfLsqT0DiwMmcJ9M2Jrpq0+0dBGg94QXcFk4lMpkDWCCavtrav8/KFI0qRkg09r R3xoGAEmc+SHbEnc+qJC+/4mB6fMEr9lkiAFb9OpDVR60osgcjw5l22OuXSgrr0JNcGljsWEVIL AS+CnyUa3EsC8YgIS4A== X-Proofpoint-ORIG-GUID: TJ5rtYZK0B5p1SP96IunmVlYWmWopR8y X-Authority-Analysis: v=2.4 cv=Lo2fC3dc c=1 sm=1 tr=0 ts=69b0e05a cx=c_pps a=R6oCqFB+Yf/t2GF8e0/dFg==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=LGEa-qlQBoucZRe8vqkA:9 a=QEXdDO2ut3YA:10 a=TD8TdBvy0hsOASGTdmB-:22 X-Proofpoint-GUID: TJ5rtYZK0B5p1SP96IunmVlYWmWopR8y 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 priorityscore=1501 clxscore=1015 impostorscore=0 bulkscore=0 malwarescore=0 phishscore=0 lowpriorityscore=0 adultscore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110026 The ubwc_dec_version field has been inherited from the MDSS driver and it is equal to the version of the UBWC decoder in the display block only. Other IP Cores can have different UBWC decoders and so the version would vary between blocks. As the value is no longer used as is not relevant to other UBWC database consumers, drop it from the UBWC database. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/soc/qcom/ubwc_config.c | 22 ---------------------- include/linux/soc/qcom/ubwc.h | 2 -- 2 files changed, 24 deletions(-) diff --git a/drivers/soc/qcom/ubwc_config.c b/drivers/soc/qcom/ubwc_config.c index e63daf748e30..c5c7fcb4d013 100644 --- a/drivers/soc/qcom/ubwc_config.c +++ b/drivers/soc/qcom/ubwc_config.c @@ -18,7 +18,6 @@ static const struct qcom_ubwc_cfg_data no_ubwc_data =3D { =20 static const struct qcom_ubwc_cfg_data kaanapali_data =3D { .ubwc_enc_version =3D UBWC_6_0, - .ubwc_dec_version =3D UBWC_6_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .ubwc_bank_spread =3D true, @@ -28,7 +27,6 @@ static const struct qcom_ubwc_cfg_data kaanapali_data =3D= { =20 static const struct qcom_ubwc_cfg_data msm8937_data =3D { .ubwc_enc_version =3D UBWC_1_0, - .ubwc_dec_version =3D UBWC_1_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL1 | UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, @@ -37,7 +35,6 @@ static const struct qcom_ubwc_cfg_data msm8937_data =3D { =20 static const struct qcom_ubwc_cfg_data msm8998_data =3D { .ubwc_enc_version =3D UBWC_1_0, - .ubwc_dec_version =3D UBWC_1_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL1 | UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, @@ -51,7 +48,6 @@ static const struct qcom_ubwc_cfg_data qcm2290_data =3D { =20 static const struct qcom_ubwc_cfg_data sa8775p_data =3D { .ubwc_enc_version =3D UBWC_4_0, - .ubwc_dec_version =3D UBWC_4_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL3, .ubwc_bank_spread =3D true, .highest_bank_bit =3D 13, @@ -60,7 +56,6 @@ static const struct qcom_ubwc_cfg_data sa8775p_data =3D { =20 static const struct qcom_ubwc_cfg_data sar2130p_data =3D { .ubwc_enc_version =3D UBWC_3_0, /* 4.0.2 in hw */ - .ubwc_dec_version =3D UBWC_4_3, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .ubwc_bank_spread =3D true, @@ -70,7 +65,6 @@ static const struct qcom_ubwc_cfg_data sar2130p_data =3D { =20 static const struct qcom_ubwc_cfg_data sc7180_data =3D { .ubwc_enc_version =3D UBWC_2_0, - .ubwc_dec_version =3D UBWC_2_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .ubwc_bank_spread =3D true, @@ -79,7 +73,6 @@ static const struct qcom_ubwc_cfg_data sc7180_data =3D { =20 static const struct qcom_ubwc_cfg_data sc7280_data =3D { .ubwc_enc_version =3D UBWC_3_0, - .ubwc_dec_version =3D UBWC_4_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .ubwc_bank_spread =3D true, @@ -89,7 +82,6 @@ static const struct qcom_ubwc_cfg_data sc7280_data =3D { =20 static const struct qcom_ubwc_cfg_data sc8180x_data =3D { .ubwc_enc_version =3D UBWC_3_0, - .ubwc_dec_version =3D UBWC_3_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 16, @@ -98,7 +90,6 @@ static const struct qcom_ubwc_cfg_data sc8180x_data =3D { =20 static const struct qcom_ubwc_cfg_data sc8280xp_data =3D { .ubwc_enc_version =3D UBWC_4_0, - .ubwc_dec_version =3D UBWC_4_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .ubwc_bank_spread =3D true, @@ -108,7 +99,6 @@ static const struct qcom_ubwc_cfg_data sc8280xp_data =3D= { =20 static const struct qcom_ubwc_cfg_data sdm670_data =3D { .ubwc_enc_version =3D UBWC_2_0, - .ubwc_dec_version =3D UBWC_2_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, @@ -116,7 +106,6 @@ static const struct qcom_ubwc_cfg_data sdm670_data =3D { =20 static const struct qcom_ubwc_cfg_data sdm845_data =3D { .ubwc_enc_version =3D UBWC_2_0, - .ubwc_dec_version =3D UBWC_2_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 15, @@ -124,7 +113,6 @@ static const struct qcom_ubwc_cfg_data sdm845_data =3D { =20 static const struct qcom_ubwc_cfg_data sm6115_data =3D { .ubwc_enc_version =3D UBWC_1_0, - .ubwc_dec_version =3D UBWC_2_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL1 | UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, @@ -134,7 +122,6 @@ static const struct qcom_ubwc_cfg_data sm6115_data =3D { =20 static const struct qcom_ubwc_cfg_data sm6125_data =3D { .ubwc_enc_version =3D UBWC_1_0, - .ubwc_dec_version =3D UBWC_3_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL1 | UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, @@ -143,7 +130,6 @@ static const struct qcom_ubwc_cfg_data sm6125_data =3D { =20 static const struct qcom_ubwc_cfg_data sm6150_data =3D { .ubwc_enc_version =3D UBWC_2_0, - .ubwc_dec_version =3D UBWC_2_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, @@ -151,7 +137,6 @@ static const struct qcom_ubwc_cfg_data sm6150_data =3D { =20 static const struct qcom_ubwc_cfg_data sm6350_data =3D { .ubwc_enc_version =3D UBWC_2_0, - .ubwc_dec_version =3D UBWC_2_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .ubwc_bank_spread =3D true, @@ -160,7 +145,6 @@ static const struct qcom_ubwc_cfg_data sm6350_data =3D { =20 static const struct qcom_ubwc_cfg_data sm7150_data =3D { .ubwc_enc_version =3D UBWC_2_0, - .ubwc_dec_version =3D UBWC_2_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, @@ -168,7 +152,6 @@ static const struct qcom_ubwc_cfg_data sm7150_data =3D { =20 static const struct qcom_ubwc_cfg_data sm8150_data =3D { .ubwc_enc_version =3D UBWC_3_0, - .ubwc_dec_version =3D UBWC_3_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 15, @@ -176,7 +159,6 @@ static const struct qcom_ubwc_cfg_data sm8150_data =3D { =20 static const struct qcom_ubwc_cfg_data sm8250_data =3D { .ubwc_enc_version =3D UBWC_4_0, - .ubwc_dec_version =3D UBWC_4_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .ubwc_bank_spread =3D true, @@ -187,7 +169,6 @@ static const struct qcom_ubwc_cfg_data sm8250_data =3D { =20 static const struct qcom_ubwc_cfg_data sm8350_data =3D { .ubwc_enc_version =3D UBWC_4_0, - .ubwc_dec_version =3D UBWC_4_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .ubwc_bank_spread =3D true, @@ -198,7 +179,6 @@ static const struct qcom_ubwc_cfg_data sm8350_data =3D { =20 static const struct qcom_ubwc_cfg_data sm8550_data =3D { .ubwc_enc_version =3D UBWC_4_0, - .ubwc_dec_version =3D UBWC_4_3, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .ubwc_bank_spread =3D true, @@ -209,7 +189,6 @@ static const struct qcom_ubwc_cfg_data sm8550_data =3D { =20 static const struct qcom_ubwc_cfg_data sm8750_data =3D { .ubwc_enc_version =3D UBWC_5_0, - .ubwc_dec_version =3D UBWC_5_0, .ubwc_swizzle =3D 6, .ubwc_bank_spread =3D true, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ @@ -219,7 +198,6 @@ static const struct qcom_ubwc_cfg_data sm8750_data =3D { =20 static const struct qcom_ubwc_cfg_data glymur_data =3D { .ubwc_enc_version =3D UBWC_5_0, - .ubwc_dec_version =3D UBWC_5_0, .ubwc_swizzle =3D 0, .ubwc_bank_spread =3D true, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ diff --git a/include/linux/soc/qcom/ubwc.h b/include/linux/soc/qcom/ubwc.h index ddd7b15d9ff1..c5f049eab07d 100644 --- a/include/linux/soc/qcom/ubwc.h +++ b/include/linux/soc/qcom/ubwc.h @@ -13,8 +13,6 @@ =20 struct qcom_ubwc_cfg_data { u32 ubwc_enc_version; - /* Can be read from MDSS_BASE + 0x58 */ - u32 ubwc_dec_version; =20 /** * @ubwc_swizzle: Whether to enable level 1, 2 & 3 bank swizzling. --=20 2.47.3 From nobody Wed Apr 8 01:18:33 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 47D81377562 for ; Wed, 11 Mar 2026 03:24:13 +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=1773199458; cv=none; b=fZx0eqt568PqxUTamLesK9DBk8VrF7W6wsc4iyCpfX5XyrxpJL6yvoMHcXoE8ZI1ugc4MDvTb84Fl1Z7nocplp/mpaDDach61EQCisCGR3PrMx4bj/5qU6CIVZd45WQC0Hen/KwBCBJmJQud1Gel71VvupdDXTKZfDcQcnDK3CY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199458; c=relaxed/simple; bh=+PboiHqalsz8Ki46I7DJHtRHTDwCOdkyCS8EhQsYshk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HQEAAprnf9s4ekL1qyN6PO6kJD3gEFYnZ96jd6OjiLVFnDJd6xbRLIW+KPhxXkWxvy0E4Z2BmPN3QHTTcjwJHoFweWtf/ZI7hvXhDKNBSAcebl9quQrzNWKh1hL1cPG3T7QGQCdZmVePel9/nj1McVSuqxMPmpObc/DBxSH11CU= 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=jUr9vGEx; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=LBzs+/ID; 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="jUr9vGEx"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="LBzs+/ID" 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 62B2XK011573310 for ; Wed, 11 Mar 2026 03:24:13 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= Dqu96+mpnolQbnyrbCx3Z83re/trQ4GAJ/gmtSn1wGg=; b=jUr9vGExhD1NCkZy ngLjE0pcNcvEc81iOZ+7OlB8bzHpSQatHErQDnLEEnFNhe7JRHZVgmHQN4Toif0R sRFm8qlJwHlmjoKiZtjlLLRrdW/CmwETYNYbU2jAjk0XmGIFfhFR+S9yV/rdx/Cf koWYOI9LluW7vdfixVUzyQ2GRD/SdO6CKrZI0zYsA2tsIXdzKKBxb5+CMfOV4PBX /nNrfUtn98jsOLGTZAqbV7d3Kk1sk2a2cFoYgUs12oNxYDBOZIcI1Q7/vmKcIOFC YvVpRPCgUd+XwRUCsA3vYuEWITDSRz6x3z0zPH7FHchCTcgH1c6HFOjgNjoR3O9w mC6sGA== Received: from mail-vs1-f71.google.com (mail-vs1-f71.google.com [209.85.217.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctqgk9rc1-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:24:12 +0000 (GMT) Received: by mail-vs1-f71.google.com with SMTP id ada2fe7eead31-5ffad14cd7aso7200635137.3 for ; Tue, 10 Mar 2026 20:24:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199452; x=1773804252; 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=Dqu96+mpnolQbnyrbCx3Z83re/trQ4GAJ/gmtSn1wGg=; b=LBzs+/IDQbQ2Ru/8f/IQx2hvnYHtfL28LOCJlgaAUdG8X41n3yN0YGCkLU4A3u2XI7 p/QQbaB/sI2wdKjJzr9brVqOfud+A7LPKduQqNc12JidEfBOAdDlDUGhpinKsAtxlRDS d0QiqDzN+AJLIphX2JF9PFtZbEggA08w6Ex6Y7KNZOjqzzfWJxJQPQkNGexjEK7z/d/7 q0nt5edQpF+LcC3MfTjIwXQMlgXriWTAtt69091o2YhK5hSXdCkFyhNykTJvasU17g91 M1KWS/3DJ2rJp/UGCzFy3UFJ0wVd390ILZ1Uss/jpS/qnc/5a6ohzNTW06YGvpKZkDhW HR0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199452; x=1773804252; 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=Dqu96+mpnolQbnyrbCx3Z83re/trQ4GAJ/gmtSn1wGg=; b=u1FJTNYgkwyZX9qFaYkc5Ug/2dzZ1HAK4MsSGeoRf2L20enjQzQPY64WVhbD2SKTRs 3gWmir7KrVx+pzSrk1I5bj5tvAfwMCj2UQgqJuYtbuRk9KMhngaxxgZpSdcjgeDXrEhz zXKCnecjt1g8fTqCrYrjD8Gj92NV/S2mUHUDgoPwatrkgm74zd25SjWyx7QNyLAJHbv7 VtC/OlQoSXRJ4DNHzXo57hps8qzpdsH4jmjKKl+lIEmiEdO5MS96an3/h0cHxoFEMeaU /aH4GHF84+BqZLe1pwwr5vta95cdySqv/3AKLwDLN2hd1DiLRRn3ZcyII/1Yq1JF6LKk bDRw== X-Forwarded-Encrypted: i=1; AJvYcCXb7A65pFpOKsMQJoz6uv522KHncbys/J+EqngF6XSpoeTW9A7TucyxrmIQnhgZdRkZDWVTMtokAPDW7N8=@vger.kernel.org X-Gm-Message-State: AOJu0Yzg2TJQaGP+JNgmcDfqqmWDuvjc1CSvCgWJo8y5zNJlPw3dQavN oS69v7x4cv6LN3Oi6wy3NkKFBV3TgWsg4zb2xlRRgRh3BOCxtdO8nry7dXuYaIvd+e+EF81b9xm 1rM7E9pmhcc5rKw+gtcJxsFQurHBIW/96WaBCdMePP8dgnMqVKW/wSXq3RWGER4gDKgk= X-Gm-Gg: ATEYQzzigWdAhr3CjPqtcx9JYsQjZTIRcft5rAGWIo3mlWqhn4sNuQGiSDsPsdv7C46 Orcm8o/LIJNF/iMrPVm05iY3zzNt0pPVi7fxynJyRD9rrBZQ0tnltAjqdaWX9Bxk9XsDlyBS4vV JZssLKyHYdxbOxeMhl+/Y42cUsnyEqKgJOzyPKcX77on/J8UHHCiBs0d+COxzsUtCi4jI1Ag4kJ bh0sJlCfU8Z3qlYgBcgvrVzctG7syM/W3kwvg/J/P5TDU4wGqotz5GPSBEHBFcP/c0SwVsC4gtQ KrKWtYO2RfRLA7oIzOa8zL2Yp5AY/1R5SFT/ZO6OJN4u09DlX7V3ba65kNxjoXvV4a0SWB4HvgC gGVOL6Xoe4vIiWknmJnSBraI0fXj5r/2iqehk74z3sqPkiYHMdxPUXU4gJMl4b2NZXfeqqTJ8H5 fmOW3fzi06FlKniUfyh0kRyXZZGU/+7omFMMI= X-Received: by 2002:a05:6102:3054:b0:600:11e1:2a49 with SMTP id ada2fe7eead31-601deb6fcf3mr375504137.7.1773199452119; Tue, 10 Mar 2026 20:24:12 -0700 (PDT) X-Received: by 2002:a05:6102:3054:b0:600:11e1:2a49 with SMTP id ada2fe7eead31-601deb6fcf3mr375492137.7.1773199451703; Tue, 10 Mar 2026 20:24:11 -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.24.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:24:09 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:23:15 +0200 Subject: [PATCH v2 21/25] soc: qcom: ubwc: drop ubwc_bank_spread 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: <20260311-ubwc-rework-v2-21-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, Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=5290; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=+PboiHqalsz8Ki46I7DJHtRHTDwCOdkyCS8EhQsYshk=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsOAgr3F6Gn9p7+6+pWADTaYvdyN4nA918ZGU9 Xzl+X9VnFqJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabDgIAAKCRCLPIo+Aiko 1bO2CACq5quSnYP25Dnu/CHxK6BZOMxWDtmUMTmVWccG5Ip8pTlx+oNYBiCiOu9sm2fxx1Sf+iB MzyFyNIPUQIQHcHFU1aQ4TW0B71uSdif+O+rR8irJcMSksbb/OhgSx2F4vcWhOACbLXM0EqNjTM WrWZxybUcANffXuLdCqcggfV3zF88WNVJi3wcr0xGQtpv6XzaVi6180l6ff4Hd98TZVrwCufx4X XdehaTuwx39AuHvFDgau6DYeP32/M2UtQM9KDRLoQIp6z5k90/TNai/s3km0YTWEoERbHEa+bo8 bJBmJ+1XIeGIPoSLVoPipMFxAA/Qp9kyZpXVLYCfmbRkyjGU X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: 3K7SD9MNtV6ZLjVCv2GSmm_M_Nyi8Yte X-Proofpoint-ORIG-GUID: 3K7SD9MNtV6ZLjVCv2GSmm_M_Nyi8Yte X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfX9CkGwq9PfBZQ HBX6mOCvX6dFUkWPwLjBzHU4/kKh8l6+rO4ZlEOLBceKpFHs9h4Sxfhe5f8TzafnLQh0IPgkVHw o5Ho+m7EBIQ2YJDCwo98nFj7UoztnRvfO/FRrLdn4CYEONe7oRgvvFJFB+5lloIXhUx4kKzZfy+ J8DtdGpKaymm6sqZdimiI1+Q05rM9Gi0Z5Emd20srilyiWeRgC9XADvSXO/RsurX3V8zXXkN9L5 7LPbKHhAw//K4SRYHcSjOI73brlMsIwDed8Px0co4Oo186iE40iUlBmHQWkalznx1+WHOMeDi3f FKylIxDZX8A5KD1j77En0jekFhQhH6+b/fE0F35AjGtrUQqKq/G0nEm1wzCuknMva9RJVK93+nd Zz6TkzPxHYL86wYjIXPFBcn1v3GH0cK+hyfSisSWc0cJJlIC7pO1Xr+Byg8SLEgD35AUSmiwaq4 fX4BSbjRjfMcM1tn7OA== X-Authority-Analysis: v=2.4 cv=M4JA6iws c=1 sm=1 tr=0 ts=69b0e05c cx=c_pps a=P2rfLEam3zuxRRdjJWA2cw==: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=j0qWcOM9GDCbVNQ44DEA:9 a=QEXdDO2ut3YA:10 a=ODZdjJIeia2B_SHc_B0f: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 According to the documentation, UBWC bank spreading should be enabled for all targets. It's just not all targets have separate bit to control it. Drop the bit from the database and make the helper always return true. If we need to change it later, the helper can be adjusted according to the programming guides. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/soc/qcom/ubwc_config.c | 13 ------------- include/linux/soc/qcom/ubwc.h | 3 +-- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/drivers/soc/qcom/ubwc_config.c b/drivers/soc/qcom/ubwc_config.c index c5c7fcb4d013..070bf97e134e 100644 --- a/drivers/soc/qcom/ubwc_config.c +++ b/drivers/soc/qcom/ubwc_config.c @@ -20,7 +20,6 @@ static const struct qcom_ubwc_cfg_data kaanapali_data =3D= { .ubwc_enc_version =3D UBWC_6_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, - .ubwc_bank_spread =3D true, .highest_bank_bit =3D 16, .macrotile_mode =3D true, }; @@ -49,7 +48,6 @@ static const struct qcom_ubwc_cfg_data qcm2290_data =3D { static const struct qcom_ubwc_cfg_data sa8775p_data =3D { .ubwc_enc_version =3D UBWC_4_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL3, - .ubwc_bank_spread =3D true, .highest_bank_bit =3D 13, .macrotile_mode =3D true, }; @@ -58,7 +56,6 @@ static const struct qcom_ubwc_cfg_data sar2130p_data =3D { .ubwc_enc_version =3D UBWC_3_0, /* 4.0.2 in hw */ .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, - .ubwc_bank_spread =3D true, .highest_bank_bit =3D 13, .macrotile_mode =3D true, }; @@ -67,7 +64,6 @@ static const struct qcom_ubwc_cfg_data sc7180_data =3D { .ubwc_enc_version =3D UBWC_2_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, - .ubwc_bank_spread =3D true, .highest_bank_bit =3D 14, }; =20 @@ -75,7 +71,6 @@ static const struct qcom_ubwc_cfg_data sc7280_data =3D { .ubwc_enc_version =3D UBWC_3_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, - .ubwc_bank_spread =3D true, .highest_bank_bit =3D 14, .macrotile_mode =3D true, }; @@ -92,7 +87,6 @@ static const struct qcom_ubwc_cfg_data sc8280xp_data =3D { .ubwc_enc_version =3D UBWC_4_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, - .ubwc_bank_spread =3D true, .highest_bank_bit =3D 16, .macrotile_mode =3D true, }; @@ -116,7 +110,6 @@ static const struct qcom_ubwc_cfg_data sm6115_data =3D { .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL1 | UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, - .ubwc_bank_spread =3D true, .highest_bank_bit =3D 14, }; =20 @@ -139,7 +132,6 @@ static const struct qcom_ubwc_cfg_data sm6350_data =3D { .ubwc_enc_version =3D UBWC_2_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, - .ubwc_bank_spread =3D true, .highest_bank_bit =3D 14, }; =20 @@ -161,7 +153,6 @@ static const struct qcom_ubwc_cfg_data sm8250_data =3D { .ubwc_enc_version =3D UBWC_4_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, - .ubwc_bank_spread =3D true, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, .macrotile_mode =3D true, @@ -171,7 +162,6 @@ static const struct qcom_ubwc_cfg_data sm8350_data =3D { .ubwc_enc_version =3D UBWC_4_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, - .ubwc_bank_spread =3D true, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, .macrotile_mode =3D true, @@ -181,7 +171,6 @@ static const struct qcom_ubwc_cfg_data sm8550_data =3D { .ubwc_enc_version =3D UBWC_4_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, - .ubwc_bank_spread =3D true, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, .macrotile_mode =3D true, @@ -190,7 +179,6 @@ static const struct qcom_ubwc_cfg_data sm8550_data =3D { static const struct qcom_ubwc_cfg_data sm8750_data =3D { .ubwc_enc_version =3D UBWC_5_0, .ubwc_swizzle =3D 6, - .ubwc_bank_spread =3D true, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, .macrotile_mode =3D true, @@ -199,7 +187,6 @@ static const struct qcom_ubwc_cfg_data sm8750_data =3D { static const struct qcom_ubwc_cfg_data glymur_data =3D { .ubwc_enc_version =3D UBWC_5_0, .ubwc_swizzle =3D 0, - .ubwc_bank_spread =3D true, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, .macrotile_mode =3D true, diff --git a/include/linux/soc/qcom/ubwc.h b/include/linux/soc/qcom/ubwc.h index c5f049eab07d..405d83f8d95b 100644 --- a/include/linux/soc/qcom/ubwc.h +++ b/include/linux/soc/qcom/ubwc.h @@ -33,7 +33,6 @@ struct qcom_ubwc_cfg_data { * DDR bank. This should ideally use DRAM type detection. */ int highest_bank_bit; - bool ubwc_bank_spread; =20 /** * @macrotile_mode: Macrotile Mode @@ -88,7 +87,7 @@ static inline bool qcom_ubwc_macrotile_mode(const struct = qcom_ubwc_cfg_data *cfg =20 static inline bool qcom_ubwc_bank_spread(const struct qcom_ubwc_cfg_data *= cfg) { - return cfg->ubwc_bank_spread; + return true; } =20 static inline u32 qcom_ubwc_swizzle(const struct qcom_ubwc_cfg_data *cfg) --=20 2.47.3 From nobody Wed Apr 8 01:18:33 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 BE7AB379EEA for ; Wed, 11 Mar 2026 03:24:15 +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=1773199459; cv=none; b=RSWse93SBTmWpBFplQbDiB2TQgp3olWd9UVuYg/A21Kx3TmsuRjs9/fOGyLyJ84JTWsxXhQQsIRthfPYOxdv/qZD6U0RRe5AtVkcYXa21DjDUIkKSygzzDnasxF5vYfO2AbW5jlgHyBWVtGvfJe5ATSOnf7Gs2yz/KXKqqu9ZfI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199459; c=relaxed/simple; bh=v7QXktkShy+wyahjFgEkbZoSxJ/5hj9cJD9SDRJzeIA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dTiDG/fxKexRybHpB7q0sKwyC94SZxdXUj5xO0w8Wu+dik3QlN/K9DVT/fYFFThJZXeFz9MMzF6MYFnb2P3KauD9AZ0uuNd3kMvPS+1vp6NR15oQZZ++Bt98XLM9qQQ6fGmTQVjT7GQ4czIXmjMUJ1vbpOdUMLDh7jrOtdD3St4= 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=EPaKyUHK; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=H5WfBg3l; 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="EPaKyUHK"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="H5WfBg3l" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62ANop5v146016 for ; Wed, 11 Mar 2026 03:24:15 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= qJ6Ex/AAn1uIE82cXCit/bkBSE8pPV30Id+vTgVPV2k=; b=EPaKyUHKdbnZr9DO Jl+rPoRSMo/b/1qj7cKSv98+8FErd1knh6+Nfmc9qp7QF4NN6NVFj2o8Izz1nr4q 2xu8IvyFckXkcKg47ygB0sZh3Dfqex21jhlDz0q8JkHJ6/VHnVl68ryNb1XEuWcb n2KoWHLhI0/QjvAbqoH8lQt4sSG5jDiT6FVlAbNFU2NDhzu/lBlAKGMbj1iZOUcC ucZXNEsEHLUdP4sEFC6U/mAquiNVpErK2rC7eJpnUokJr3sVcSX5hOvzx/BAr2Tj mKPBZf+qAvVxST4LOtuKocPM0kP+QLNvI8XJVlULO4oLdZ0a1vRZONmYpoCguSOs fZ29Tg== Received: from mail-ua1-f70.google.com (mail-ua1-f70.google.com [209.85.222.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctwav8h8m-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:24:14 +0000 (GMT) Received: by mail-ua1-f70.google.com with SMTP id a1e0cc1a2514c-9484dbd65a7so22559736241.1 for ; Tue, 10 Mar 2026 20:24:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199454; x=1773804254; 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=qJ6Ex/AAn1uIE82cXCit/bkBSE8pPV30Id+vTgVPV2k=; b=H5WfBg3lH5dwZXFUZHGaTFgJSeubIrY0EZ0weWwIeGngQfh1PSSJHkS0LjVnhC2jTn I3WHzmtP1WukpEl5yZ5ruEabIGFM6jE1d4l2sgYFbd/8byRAHBCrmIKvBrzILxENSDhz DmfpUM99LDHGsCt0t3fKJnz1ej86TKr8oMiyUiTf2E2MaeFhIfbJZL9E12UqbZBJ9EQC hPSdpMsRiLhWzNalMelqHbNIcCqPwK+fH7q3YgIq4VezWAeBfTlSeX+nL5io9ZVaAdAT S9IVfDqkp5pNBCivlMxGTVaeUNfTSfff911rNo1Zwn2ZWN9MLY1acn3tCnXSW+xvD22O PymA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199454; x=1773804254; 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=qJ6Ex/AAn1uIE82cXCit/bkBSE8pPV30Id+vTgVPV2k=; b=g3HFqple+eMy01pZxGKdIGXsakbP3QULNfib4BKrPJqRDm+9V9myNoxdfdRfoggDIM ywY1ONJ7jSqmXJkIvIK0YCE9qoltFpX3RMc0BCXXgxbBhpZxiXbU5fhi6k4nGkzNGQd/ IjmFYS65dYJdD9DO8CnQu7OfX+IRb+CeLOo6MVKYQIaAnAtJNu/YY4ds0Tk15tX7NvZ9 nWCRyEe7N/PDQpcoNP43VAg9QwVLvrgMMpD38Proyz6MSyy2xOW0+WWIzSVULH7s+dQw 4X2qrRu2/evUkAXXVyMQz9y2bTvLdbFAISA3gmjEsCKOPyK2CWsd7bMRLyg1JLlnLbxC lmag== X-Forwarded-Encrypted: i=1; AJvYcCU3Qr7LJ9P1YpAMC5mDQoLunQPuVWAp1vw8TFWa8D9tBWcDeVoyxTKhNwCV4a9gscUO/pK31qh9nN7FgH8=@vger.kernel.org X-Gm-Message-State: AOJu0YwZrBiza4a1Ny2Pz5FAZWpTbTpD7KsjZPjc3XhngIPUFGfJxK76 OAw/Qu29z4Xa4zYi6AaCeS/t0rCJ6H09OqpNJjPNc7gOIo5y7z++CHPj7j1ZsA0tSldRXztF1AR 496fIEKyVX5Q93C0xew9VtCVmItNaDIQqU553sJ0ALqGMCMKV3tABFCS19JZJgd+uf64= X-Gm-Gg: ATEYQzxCuq9DuPUa1cSJiHlKL5dAHOTrQ2+PAIXxIhi3U1pEGRHES9d7n2HvZlKT72g Qyebc3JL6Sb7GxhFGxuoZnKjS5QIrBqmGnPuMRjWqsXWI9SRA+IxdOBK+71Yn5y8QZ4Znj18u21 A+jOtAlpaxEnd3l5fRqM3KaVFr8ZmVMKCnNb7reOuLd5qnbtD1E7xZfQSqag8zaCP8SYatyX3bN u9FYDRnGONgWZoE1VDbgFpTGq8gWqMLmgW/wKJvLDVe6DKGvJ8bZ9urERJxkIcAmos09Iq4wEP3 PsmZ+Q1DwrrZ2wl6MXSJG+JPCu2Z6NN1ddx28i7v/9wfnN6F8YbIJDsY66iuUFRVll650ur0tzN 2eVC2e90k98bMabi3A0L2LXll6yRcwquBz5gh+yEnrIoUEa+UUf4GgNudspezp2FSwDwsnNn4mo jCsnn4JsjMyXPhSSWp7sm9NHjhhXoLrZseFW0= X-Received: by 2002:a05:6102:3ec5:b0:5ff:be25:8937 with SMTP id ada2fe7eead31-601def8ba4emr391971137.31.1773199453587; Tue, 10 Mar 2026 20:24:13 -0700 (PDT) X-Received: by 2002:a05:6102:3ec5:b0:5ff:be25:8937 with SMTP id ada2fe7eead31-601def8ba4emr391960137.31.1773199453127; Tue, 10 Mar 2026 20:24:13 -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.24.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:24:12 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:23:16 +0200 Subject: [PATCH v2 22/25] soc: qcom: ubwc: drop macrotile_mode from the database 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: <20260311-ubwc-rework-v2-22-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=5167; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=v7QXktkShy+wyahjFgEkbZoSxJ/5hj9cJD9SDRJzeIA=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsOAgj2HgISlUPrvCjaoYzcTVT6py7o6pRHVXU feV1EFJ8IyJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabDgIAAKCRCLPIo+Aiko 1btsB/0USJGa3Ry2R3a+LIu314rqekDLweSXtIqgNDzlrUYrbQwg6E4GFCCStdBj+3P/Msz+nSu BzWhP+1FFMXni3U8QZRAw4tTbieehjDHu3PlhUYbKLhvug58fIjAA6glH+qoadvZDRU4kQ3M1vU JR/97libKY/j1rRPkQFSq10LBK0Wm/x//0IlAhIW2lrR7S+snqkLC0bClCcUYKt8S5msGvT4Ajy VOS2bOcu0/yL2/fhPvCvBhB1g48LT8x0L5HFL5SDKr9WcBnP9JVjKSL1WAa3kAzoYBMT6b3rw3T tSkRhUxS9qwsxpn4B6rahz6V17F5QBRQOuTA59ot5n/vEKZi X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfX9KOacWOrT1xz GwMuwXuK5qZMVRwsT6aE9dzbElx1r4Z3hLDlwAeusqPjXE+QIt0mMKp1ADaurr3pP6JN077KNUF Vh/hfvtPdKn4uO0kcUVKLArlSeXh+DfcSS9RqoNveqvTobyxXmAzmjiAW8jzFbkx4+8gonLZxmD kYSBrKef/Rx7PJufAhQIUjKOOFiXaZy2xMAqpyCRvfWe20yCGQxmURlt+j0La7VQiSPR1V+5HzY TR2ZRZP2bPSZaWtq0TEqi/GNbWYl7zC1lU8beIbd6RUp4zdo6JpDrQtkNdwz8A8xDNXgTRGzIty XvtR7WhsEix64SUcun9NicoqJF+X0vzDC3QdOA67BAenqswBF5WMPNvZ7bPhf/qpQ8E47qKZxKp qrUpYoD2U6tQ8XtxUcLsMSbwqZQ0oves3atVHgmv6oC4V2oX7bwfDrVRZUfhzv5Ue7YJXSa3dYD 3FTCiXVbXUtqnfsItCA== X-Proofpoint-GUID: y-dk1vF2S6QpquRNKzqlr2-N7VL8QM7F X-Authority-Analysis: v=2.4 cv=K/Yv3iWI c=1 sm=1 tr=0 ts=69b0e05e cx=c_pps a=R6oCqFB+Yf/t2GF8e0/dFg==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=EUspDBNiAAAA:8 a=lOjMx_-Oxa8n0LcNG1gA:9 a=QEXdDO2ut3YA:10 a=TD8TdBvy0hsOASGTdmB-:22 X-Proofpoint-ORIG-GUID: y-dk1vF2S6QpquRNKzqlr2-N7VL8QM7F 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 phishscore=0 impostorscore=0 malwarescore=0 spamscore=0 bulkscore=0 lowpriorityscore=0 suspectscore=0 adultscore=0 clxscore=1015 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110026 All the users have been migrated to using qcom_ubwc_macrotile_mode() instead of reading the raw value from the config structure. Drop the field from struct qcom_ubwc_cfg_data and replace it with the calculated value. Split single UBWC_3_0 into UBWC_3_0 (no macrotile mode) and UBWC_3_1 (with macrotile mode). Signed-off-by: Dmitry Baryshkov --- drivers/soc/qcom/ubwc_config.c | 15 ++------------- include/linux/soc/qcom/ubwc.h | 18 ++++++++---------- 2 files changed, 10 insertions(+), 23 deletions(-) diff --git a/drivers/soc/qcom/ubwc_config.c b/drivers/soc/qcom/ubwc_config.c index 070bf97e134e..51de36f5f40b 100644 --- a/drivers/soc/qcom/ubwc_config.c +++ b/drivers/soc/qcom/ubwc_config.c @@ -21,7 +21,6 @@ static const struct qcom_ubwc_cfg_data kaanapali_data =3D= { .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 16, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data msm8937_data =3D { @@ -49,15 +48,13 @@ static const struct qcom_ubwc_cfg_data sa8775p_data =3D= { .ubwc_enc_version =3D UBWC_4_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 13, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data sar2130p_data =3D { - .ubwc_enc_version =3D UBWC_3_0, /* 4.0.2 in hw */ + .ubwc_enc_version =3D UBWC_3_1, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 13, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data sc7180_data =3D { @@ -68,11 +65,10 @@ static const struct qcom_ubwc_cfg_data sc7180_data =3D { }; =20 static const struct qcom_ubwc_cfg_data sc7280_data =3D { - .ubwc_enc_version =3D UBWC_3_0, + .ubwc_enc_version =3D UBWC_3_1, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data sc8180x_data =3D { @@ -80,7 +76,6 @@ static const struct qcom_ubwc_cfg_data sc8180x_data =3D { .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 16, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data sc8280xp_data =3D { @@ -88,7 +83,6 @@ static const struct qcom_ubwc_cfg_data sc8280xp_data =3D { .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 16, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data sdm670_data =3D { @@ -155,7 +149,6 @@ static const struct qcom_ubwc_cfg_data sm8250_data =3D { UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data sm8350_data =3D { @@ -164,7 +157,6 @@ static const struct qcom_ubwc_cfg_data sm8350_data =3D { UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data sm8550_data =3D { @@ -173,7 +165,6 @@ static const struct qcom_ubwc_cfg_data sm8550_data =3D { UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data sm8750_data =3D { @@ -181,7 +172,6 @@ static const struct qcom_ubwc_cfg_data sm8750_data =3D { .ubwc_swizzle =3D 6, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data glymur_data =3D { @@ -189,7 +179,6 @@ static const struct qcom_ubwc_cfg_data glymur_data =3D { .ubwc_swizzle =3D 0, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, - .macrotile_mode =3D true, }; =20 static const struct of_device_id qcom_ubwc_configs[] __maybe_unused =3D { diff --git a/include/linux/soc/qcom/ubwc.h b/include/linux/soc/qcom/ubwc.h index 405d83f8d95b..d4a0cfb133fa 100644 --- a/include/linux/soc/qcom/ubwc.h +++ b/include/linux/soc/qcom/ubwc.h @@ -33,15 +33,6 @@ struct qcom_ubwc_cfg_data { * DDR bank. This should ideally use DRAM type detection. */ int highest_bank_bit; - - /** - * @macrotile_mode: Macrotile Mode - * - * Whether to use 4-channel macrotiling mode or the newer - * 8-channel macrotiling mode introduced in UBWC 3.1. 0 is - * 4-channel and 1 is 8-channel. - */ - bool macrotile_mode; }; =20 #define UBWC_1_0 0x10000000 @@ -80,9 +71,16 @@ static inline bool qcom_ubwc_min_acc_length_64b(const st= ruct qcom_ubwc_cfg_data return cfg->ubwc_enc_version =3D=3D UBWC_1_0; } =20 +/* + * @qcom_ubwc_macrotile_mode: whether to use 4-channel or 8-channel macrot= iling + * + * The 8-channel macrotiling mode was introduced in UBWC 3.1. + * + * Returns: false for the 4-channel and true for 8-channel. + */ static inline bool qcom_ubwc_macrotile_mode(const struct qcom_ubwc_cfg_dat= a *cfg) { - return cfg->macrotile_mode; + return cfg->ubwc_enc_version >=3D UBWC_3_1; } =20 static inline bool qcom_ubwc_bank_spread(const struct qcom_ubwc_cfg_data *= cfg) --=20 2.47.3 From nobody Wed Apr 8 01:18:33 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 A020F36EA9D for ; Wed, 11 Mar 2026 03:24:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199464; cv=none; b=Py2NWXoqVJdGMtoyp+Ysn4FSA9cpSboV5344KoE9pcUB2qSdnbRQ1dSQ0oW3q1zRFacSmX3uMTp+F/WMa+W4QnNQSzYrDywpyOmVUaHg0C8yr+BttlEabFjqOPXVW09F1eGHxpmCLsVmeV6uriTT2mpM6lAqGN2txsbtBH2wudw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199464; c=relaxed/simple; bh=Q5MIUHiSxbGVEdUF7Mbz0DMJwk2qxjWolhKQbh9xwlg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BVS4jq1QSIMhTGwawzayGGfnkIDxSj+/+tNvLqYoi0obiZpc00meagwzPhTfppb/2QRJ5uwXOgrBkG8Lll5DGm41pY6tACLI9iqTyBbo5vCBfNkjusQWCF4W68YR7kkQG5Uu2UkezFj7BbG4mHI5gA+F8lYknFcMfKprTVlz5rU= 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=ntjZcPHD; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=FWjMhjzA; 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="ntjZcPHD"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="FWjMhjzA" 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 62B17M1s508294 for ; Wed, 11 Mar 2026 03:24:18 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= +xGen/0FzexLqmKExWBIL2m3ElpzS8KM21Ro0B4OQGs=; b=ntjZcPHDBjyiH+Ti 3uT19/VXp70spwnBT/rNi8s6cvm2nhF0TSxH2KAr+gklhZN3gE4umhP/9HR7ZGpL kf7JqN9yyx4KfkXpBxIYKJ4UidiOEyeyPwg/I/ySANzp6uxlyApuTXB/SDJlRSs0 g1Mj+jzwUAsgQ2qN/ia8er70JDuFPuZbNikEPmy/9oVhyb+maBgEly8aQt+JZiyH 1kNroUnXpXNeO2iEZp8hrorHWLv9/5X5al5K00DFtRzZm1qmsZ8oQUeWwojfW9KG giqL8xchnC9Ca3auh9iEXM2JheDnXHO32L5QrROntl/n+qPjwojU1bFwI7WixFet XICqXg== Received: from mail-vs1-f71.google.com (mail-vs1-f71.google.com [209.85.217.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctppaj141-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:24:18 +0000 (GMT) Received: by mail-vs1-f71.google.com with SMTP id ada2fe7eead31-5ffaf5b522eso41215680137.1 for ; Tue, 10 Mar 2026 20:24:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199458; x=1773804258; 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=+xGen/0FzexLqmKExWBIL2m3ElpzS8KM21Ro0B4OQGs=; b=FWjMhjzAXshuHg6MUO6lp/YDwGwuSLaeXQ8Nc70aGP53BzZAEGA8MpoR8ciawwXaMV NVD0hkFnX1A2gcBUy6GGLl1ZyWXizn28ElzgQt6ZrlPAV+H4nYDtR7QuryobzxHDJk+S UHjrE4baxnEb1OqofgJRlRnr7gIiasM1eYTGrxCukZBmoS9PPcA1frR8gi5X6nidnR3f Q+Drkg1cFXIysEFh59D8KaZLnnPOMjnZcF2OPDLAJQmLmYOw73ch5gqLRw6CnGliPl/w NbXQ0k2FtS3UjTDM6IwPo+I4C9HiQyhjHstH9lMijtdz87FXXjozYeJIsZzwkktOeFZs ZvpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199458; x=1773804258; 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=+xGen/0FzexLqmKExWBIL2m3ElpzS8KM21Ro0B4OQGs=; b=TZbqg2vux+vl6YbOWpyXwocY5tlnJWW3DRwlhddzNalxCvjvAb/neMUUMV1bOM7CiN HQDKHGZOFM/jsMUsnzvE7q85xJDnlcC3O5IpAWZkoFHRzEovwqVBNcn63s2zbNU+j3MC mq7qTPoHZsW55p1e+LYhobpxte1DJNzDXi93fGM2H/mfpaOn1V7j8k5LzIGcvb4jOHZ5 XsHADTVteyh5Au8F4/6uzAtWSXKu31aQA73nPnPMWed42VFoMliUGGRxlvteK/nCglJ4 kd/EuhGz5NqoW7Z9AhdPZ6sceX1tfNpkmDQVgkL2cInwCRGdMU4XstQs2Npn9AQSl6O9 bkoQ== X-Forwarded-Encrypted: i=1; AJvYcCV1UQY+buyFPWqsC6m+S2S4l8GYgkfiwXH+PKZmBEO/zmIi54shTLNeUFI9UyyXfwXKT2xIn2uSizhpFxk=@vger.kernel.org X-Gm-Message-State: AOJu0Yxhcd0n4k40w0X2fALjpLzJSV5Sv+KioDNutAapyR9p9FIJAWBo OUxgr+rMyPrdpiaAgk8jluBs2TcKbk2n697/MU2XmYww4Y53uFdwxhkMbBNT+15bUxAtH8yLm/g hZnJl2iSvFi3sd54lZTwaGco698ZraLI+/djrTQjVYx9CL3a6qaAEfORWPHRyvibs4vE= X-Gm-Gg: ATEYQzw+bCbt72r8+lhr4hJb1dfe6B7OwPErlVvL2zg4vFdaC5HOKWh7EEi/9aFGIM2 3R7Hc5u7suiYeVEyMJYmL+xKWc0xtWB/MqzTcb63uBraL8UkhmYRkhIMv2m3N05gTjZpoRNWRQM Tz9O6q9kpCtXAzhq2DHwy+qBNSuEhjgT+RqrBAf++unw4t7+MiUwjhSFWLJUWaIrgSwbqiFK8ju gE88UDdB5yRszPO7nNSdhQn/8kwfT/UUzYDziNiSOjvp1lB8fYxsE1fzNVCqIBFsPv88UOg8yim 2DzgX5ZqOCX6kDZSP+wzCPDbs+FPz/0JCQch0UtAxvXtVdUEpyO+doeiL+V/rGqYqvWx/y9uyib vG02DLIZe56D1e/LYaJlCmcihnqprQ84QB0FqOR5DzGhVnJMS1hM1pKiQdQ8voGjgd+nfIO87sz qydi4iRbnURtKk6YpaPEBobhilXWZpIeZ+kuA= X-Received: by 2002:a05:6102:512b:b0:5db:ca9e:b57d with SMTP id ada2fe7eead31-601def4f45emr498319137.19.1773199457543; Tue, 10 Mar 2026 20:24:17 -0700 (PDT) X-Received: by 2002:a05:6102:512b:b0:5db:ca9e:b57d with SMTP id ada2fe7eead31-601def4f45emr498300137.19.1773199457034; Tue, 10 Mar 2026 20:24:17 -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.24.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:24:14 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:23:17 +0200 Subject: [PATCH v2 23/25] soc: qcom: ubwc: use fixed values for UBWC swizzle for UBWC < 4.0 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: <20260311-ubwc-rework-v2-23-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, Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=5999; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=Q5MIUHiSxbGVEdUF7Mbz0DMJwk2qxjWolhKQbh9xwlg=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsOAgU3yCGHPGEzdrmenVuVhAY4o838XvB+HzL 8v84IHDn+yJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabDgIAAKCRCLPIo+Aiko 1bKrCACbiQPWPt6lqeYVgOqnd3/PZglPIeRLdzx6AB0vn0PZnSQw9mMeNqMYWLZzy0Nm1egQExu 938S5fN4Ex8OGTAOrpsCDTIkbvGGK0atWpug5K9y2m1o0AczY1a9z/FEogI4eGaDFxn1UgIbL3Q AYm3U4+DNRdSo3KhZ91rqQZIJf0ZmLbZDP1ywAbhBljaB54xVOwj6JXLMOX3qPwZg8lqfAUsjaR 7vh1Rh/hTQB22D6qtjbCRba9XrGwhEI7oiNnzCDTqnJoxyOTjH7MSHb7yVDnS4DvMo5NZ/wZK4X PeJP95+X/0cEJnoEGURHFmyaXrBHS6iSzFt0AQH2VnY8fPQD X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: UBBjERVcmgxzul1JhLWR9w5L8_T9UVmt X-Authority-Analysis: v=2.4 cv=D7BK6/Rj c=1 sm=1 tr=0 ts=69b0e062 cx=c_pps a=P2rfLEam3zuxRRdjJWA2cw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=EUspDBNiAAAA:8 a=8a_ODPMxA7UucN5sxwIA:9 a=QEXdDO2ut3YA:10 a=ODZdjJIeia2B_SHc_B0f:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfX8UqM9tMRVxnm +j5ELI+BKYkEDib+nhBX61oDoGETMSETYJ/yG4ozulrKmp5wMsMrvJGD1tBaUbvIvqF07C3J5yu +IZotC4d2G8zdUhs/uJZTncfCVWyR89+xrLtJPu90SGH+A0Ju0jpXiaMBN3+OOk1/lSjG7YX3jN ySDXnmknllGiP/ui+kjrzzGWyg+HNHjvxLVNLj2FQwF97BqdJZ15CPfn3JXNEa9WdOIgl1g8Frf G5S+z0u/PfqC9QLYMZvNpCf2p0XssFVFDUX4OExApIh5ZCtNui/ehYj3x6nFeh2TAM+kKgVe2cr WTip3tLR/eArYhs7ID7qtTYUfDQ0RU/0unaadqm3TFzNjFut13cIadnFTl7KJdM9zNZqbTC3F5f /PfznQP2LLFIvYh2DY/hkTdRO9RWSj4H7ZzSUa12aVbuBhWMqBX8mZXV4Vs3QwOtK3JwURd4eIf jQLZt7fu1+5fa+cWl9g== X-Proofpoint-ORIG-GUID: UBBjERVcmgxzul1JhLWR9w5L8_T9UVmt 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 suspectscore=0 phishscore=0 impostorscore=0 spamscore=0 bulkscore=0 malwarescore=0 priorityscore=1501 clxscore=1015 adultscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110026 UBWC devices before 4.0 use standard UBWC swizzle levels. As all the drivers now use the qcom_ubwc_swizzle() helper, move those values to the helper, leaving UBWC 4.0+ intact for now. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/soc/qcom/ubwc_config.c | 34 ---------------------------------- include/linux/soc/qcom/ubwc.h | 33 ++++++++++++++++++++++++--------- 2 files changed, 24 insertions(+), 43 deletions(-) diff --git a/drivers/soc/qcom/ubwc_config.c b/drivers/soc/qcom/ubwc_config.c index 51de36f5f40b..49edfabb5e18 100644 --- a/drivers/soc/qcom/ubwc_config.c +++ b/drivers/soc/qcom/ubwc_config.c @@ -25,17 +25,11 @@ static const struct qcom_ubwc_cfg_data kaanapali_data = =3D { =20 static const struct qcom_ubwc_cfg_data msm8937_data =3D { .ubwc_enc_version =3D UBWC_1_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL1 | - UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, }; =20 static const struct qcom_ubwc_cfg_data msm8998_data =3D { .ubwc_enc_version =3D UBWC_1_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL1 | - UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 15, }; =20 @@ -52,94 +46,66 @@ static const struct qcom_ubwc_cfg_data sa8775p_data =3D= { =20 static const struct qcom_ubwc_cfg_data sar2130p_data =3D { .ubwc_enc_version =3D UBWC_3_1, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 13, }; =20 static const struct qcom_ubwc_cfg_data sc7180_data =3D { .ubwc_enc_version =3D UBWC_2_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, }; =20 static const struct qcom_ubwc_cfg_data sc7280_data =3D { .ubwc_enc_version =3D UBWC_3_1, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, }; =20 static const struct qcom_ubwc_cfg_data sc8180x_data =3D { .ubwc_enc_version =3D UBWC_3_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 16, }; =20 static const struct qcom_ubwc_cfg_data sc8280xp_data =3D { .ubwc_enc_version =3D UBWC_4_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 16, }; =20 static const struct qcom_ubwc_cfg_data sdm670_data =3D { .ubwc_enc_version =3D UBWC_2_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, }; =20 static const struct qcom_ubwc_cfg_data sdm845_data =3D { .ubwc_enc_version =3D UBWC_2_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 15, }; =20 static const struct qcom_ubwc_cfg_data sm6115_data =3D { .ubwc_enc_version =3D UBWC_1_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL1 | - UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, }; =20 static const struct qcom_ubwc_cfg_data sm6125_data =3D { .ubwc_enc_version =3D UBWC_1_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL1 | - UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, }; =20 static const struct qcom_ubwc_cfg_data sm6150_data =3D { .ubwc_enc_version =3D UBWC_2_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, }; =20 static const struct qcom_ubwc_cfg_data sm6350_data =3D { .ubwc_enc_version =3D UBWC_2_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, }; =20 static const struct qcom_ubwc_cfg_data sm7150_data =3D { .ubwc_enc_version =3D UBWC_2_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, }; =20 static const struct qcom_ubwc_cfg_data sm8150_data =3D { .ubwc_enc_version =3D UBWC_3_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 15, }; =20 diff --git a/include/linux/soc/qcom/ubwc.h b/include/linux/soc/qcom/ubwc.h index d4a0cfb133fa..0cbd20078ada 100644 --- a/include/linux/soc/qcom/ubwc.h +++ b/include/linux/soc/qcom/ubwc.h @@ -22,9 +22,6 @@ struct qcom_ubwc_cfg_data { * UBWC 4.0 adds the optional ability to disable levels 2 & 3. */ u32 ubwc_swizzle; -#define UBWC_SWIZZLE_ENABLE_LVL1 BIT(0) -#define UBWC_SWIZZLE_ENABLE_LVL2 BIT(1) -#define UBWC_SWIZZLE_ENABLE_LVL3 BIT(2) =20 /** * @highest_bank_bit: Highest Bank Bit @@ -55,12 +52,7 @@ static inline const struct qcom_ubwc_cfg_data *qcom_ubwc= _config_get_data(void) =20 static inline bool qcom_ubwc_get_ubwc_mode(const struct qcom_ubwc_cfg_data= *cfg) { - bool ret =3D cfg->ubwc_enc_version =3D=3D UBWC_1_0; - - if (ret && !(cfg->ubwc_swizzle & UBWC_SWIZZLE_ENABLE_LVL1)) - pr_err("UBWC config discrepancy - level 1 swizzling disabled on UBWC 1.0= \n"); - - return ret; + return cfg->ubwc_enc_version =3D=3D UBWC_1_0; } =20 /* @@ -88,8 +80,31 @@ static inline bool qcom_ubwc_bank_spread(const struct qc= om_ubwc_cfg_data *cfg) return true; } =20 +#define UBWC_SWIZZLE_ENABLE_LVL1 BIT(0) +#define UBWC_SWIZZLE_ENABLE_LVL2 BIT(1) +#define UBWC_SWIZZLE_ENABLE_LVL3 BIT(2) + +/** + * @qcom_ubwc_swizzle: Whether to enable level 1, 2 & 3 bank swizzling. + * + * UBWC 1.0 always enables all three levels. + * UBWC 2.0 removes level 1 bank swizzling, leaving levels 2 & 3. + * UBWC 4.0 adds the optional ability to disable levels 2 & 3. + */ static inline u32 qcom_ubwc_swizzle(const struct qcom_ubwc_cfg_data *cfg) { + if (cfg->ubwc_enc_version =3D=3D 0) + return 0; + + if (cfg->ubwc_enc_version =3D=3D UBWC_1_0) + return UBWC_SWIZZLE_ENABLE_LVL1 | + UBWC_SWIZZLE_ENABLE_LVL2 | + UBWC_SWIZZLE_ENABLE_LVL3; + + if (cfg->ubwc_enc_version < UBWC_4_0) + return UBWC_SWIZZLE_ENABLE_LVL2 | + UBWC_SWIZZLE_ENABLE_LVL3; + return cfg->ubwc_swizzle; } =20 --=20 2.47.3 From nobody Wed Apr 8 01:18:33 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 5200C37CD5C for ; Wed, 11 Mar 2026 03:24:22 +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=1773199466; cv=none; b=M3FM+ATWPLBMSEuhsRmhSOuM+LFTeJLZsq4ap+Z+x3P3lAWGlDRIi/6l4r/ueS4m99k8HVhfLGPRAvdspOpDlQ31s48+S8PxbiGDhQOKLLkda6G1/g2XdfKwYlMqC4qK38OwgwiswKW6nc6U9kipD8ZFOIKcQoaHxOD1+mlNW7o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199466; c=relaxed/simple; bh=rZmnsFdkocnUxt7VbPT73DnNFvP09IpO1PBS81ZmI4A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VEgdDNDsNkeqZYPMrcKNnH96GYV4zTE6yMDrx4j1IB4jGKibgnngkaCzP8IiEsbkV1PFV8W6FzAbJZ/ALT+SKV74ls02bcAYgW70Zsg3N765Nfxf5NnZ8gC1hzZxiwOzBptlVw59czVykxlVE4yAbmHnI5Mpd7j+xdRY77o2c1I= 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=b9sg6/ej; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=HOBQajYt; 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="b9sg6/ej"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="HOBQajYt" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62B0gJt21265992 for ; Wed, 11 Mar 2026 03:24:21 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= qxOVi+p8tkfxl+UNAqXIN85eEkQSmSuaIBeAod9N/YM=; b=b9sg6/ejnYGlWitk ob0Q/k2XhaTUdTTvxmMnnq7enUKbS9zQbfYg2DQca01QrHbWuO7r/nGHq/yRKTiC eQxw/9r573yqZQ08dCxjH7ietigafP8tak7fb2APGzPgq4RCwf2a3l8mUYdtQwYi O4ek7xys+tLbPHuuyaWyDxEBGOiuBR4gbAfzsXq+kew/5JK9i0a99c4b9lQL8Ezp VubrtkE1oZyhnw/q6SOsAdIbzP5GNRVpcY2BqFG/kXUhzIKCtDkStsJqaNglCA1/ 0kLY/j1PS450W8EA4WzFajur/M3b7yFDbjjQhqb12IcFjqFEsY8xNhPy27btu3O1 NJCVxQ== 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 4ctpkfj3w0-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:24:21 +0000 (GMT) Received: by mail-vs1-f70.google.com with SMTP id ada2fe7eead31-5ffb295babbso8848500137.1 for ; Tue, 10 Mar 2026 20:24:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199460; x=1773804260; 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=qxOVi+p8tkfxl+UNAqXIN85eEkQSmSuaIBeAod9N/YM=; b=HOBQajYtE6mrqXp3/fabGEDrwWkvlhPp6AWGKijPzV6XYkKBiSInogk2APl00nzAbJ Q8sbJOttZE2C20k3hHMkkDcCOTmEpEslVL89BbFXuwawPnUuwmnFeJVKvIub42yN8+Yb XZ3AmT3/9KpFR3aRQFl6sAiJpmkWFcKp266evHskMPTE+vbHJuiHogguByibiRtNoDxX r7ruxvi0/fT/ddGoLdb1hPQipYdveTTAh9jISvNWg8aAcC+d3cAceeLOj5nZjGH1OCee rhiheXe/eWcoLXGkzT1XkuwC/Jx1O2Luvp5fT0STNFcmXfxB8blIeLAP1kjKoOu85TFK s/RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199460; x=1773804260; 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=qxOVi+p8tkfxl+UNAqXIN85eEkQSmSuaIBeAod9N/YM=; b=oP+/b2EBLSJIxVuAl8LQb49ENCa7mI3HVS+xHr/HWPx/fDNgoSNQo4gljymKCPB+XN +5+jofHWD8qAw5Uhs8nOpo7C4ZRDxiOkbyIli2TAEtE4Hk1FUbzY7cZ2DwZ50iKovE/5 pvE0bDQDMu3g55fW1TV7pPvruYFqGr/pRXQDIaxTiY0lxMzEBwn+7eQDtS49Ek6P6HnO voUYJ9wsGsa+HFp9B4GRhB99ctFBSanwNSZnR1CtJpA4MHKDXSpLj21y/9db9qWjZYml KaLKuacUJm25wBViNDcHAhTIkgAg52gGsBDN841QrFYirj4pce0za/PpDAYj6zMTUw2d Yh6w== X-Forwarded-Encrypted: i=1; AJvYcCVr4eRq14EBYM+ZXKceFXVeNGmKmnwfRTQTH0yVQD/jvD+2Et9Omd85fNSJ2EfT7RhdOOxft1GNuxnPy5Q=@vger.kernel.org X-Gm-Message-State: AOJu0YwH+fcxf9FZkv1nrhnagjy7iZjjun6zJH9bw73NgDASGi4ojIdE nCeYh4EP1APAtbxwSzgayUYJvhkwZZDOQi/PxKwOLMO5iE1WTd324rYQgknG2zzh8VmxhnMbRuw KV6q4y5Amy6pXHxuXSgBDWhUF1K3ztTtX8GGgaGXEbXa3wrX2RlaobKGk+CRUGkSOwrE= X-Gm-Gg: ATEYQzxsAegx1kpNwikSo4l1/L1MRW58qpDOvKYOsoxoi4W8cocEp6SIIQzA/q2IZUB OKf0MjrTxwcHx4puZd/C8hRVo/PNU6Qup3n+a+ZJbZXG3rHyMsKWg0vsNkcZFoBLgzXm2cPo1J7 VpRo7G4WaJpw4lLF/f9VGaUETJv2/S86JHMQ42Rl61Q0HT7wYAC/9GJceVXfJfiOZaCUkI2TpCN BbLpWjr+65y6t6ngKIgWNYDiwUEWOYV/iRuaPh/9PK3HAmi9ZYb8QuQQMHK5CTnrIftWPwjVrBY XUAn1SlK/MSUqaQw4HKrKNXs6/397uwqRXsNkoYQYluxLYKCHnwZTnStvfm+KJ54GHhNpKENlck I127+jbdo+zAgFm+Ena5H7rt48r5/K73ncLZiLmtDDaRt38WRZF34OA2pjYbnTcspPhVP5No8/f CVMwuIgQ7nU8h9HqOu9RYLw/QYL8MlH6vr0ZA= X-Received: by 2002:a05:6102:3053:b0:5ff:2391:45c0 with SMTP id ada2fe7eead31-601deffccb1mr474917137.31.1773199460128; Tue, 10 Mar 2026 20:24:20 -0700 (PDT) X-Received: by 2002:a05:6102:3053:b0:5ff:2391:45c0 with SMTP id ada2fe7eead31-601deffccb1mr474903137.31.1773199459716; Tue, 10 Mar 2026 20:24:19 -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.24.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:24:17 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:23:18 +0200 Subject: [PATCH v2 24/25] soc: qcom: ubwc: sort out the rest of the UBWC swizzle settings 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: <20260311-ubwc-rework-v2-24-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, Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=4171; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=rZmnsFdkocnUxt7VbPT73DnNFvP09IpO1PBS81ZmI4A=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsOAgCp5vPo5lPfgY/a+NRe9fCRVoydL1AAgKW nhmt/UqKmGJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabDgIAAKCRCLPIo+Aiko 1QMpCACJIqjA9rqNRCAygAgbljoGTNrWeFT9pT53UF/x4UqPf8c6nTaNfKnBttzdt0aGxxXvqnX I+W5ih3r0P/E1MyVg4btzJbKMAcSRje0pff9egrm44STJPmpZxog9V2AklT5QCEMWoTnwLJydFa Cu3KwqH+ybQHbKVIUvCIZnvMsrdTtVofugnBTY6lRjjYEFScc1ie2PPQYPXeFqmKPLUzRg8q213 xddPtDiBb2bhY6KSwiYX6DoSYRCcCR5fXQ4NscR4n7THC+sND3eAnCNGyhI4YD1eJankuQ6pqr9 x95NOGZNwg2anaC58R7eSStkhJnJ7EjP6Ptzkcx1jloQaZ6B X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: sqCx9PLbBFkMjru_J-ReK7LyqRFOyrAE X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfXzo58RmX0Qwli kU98+E/THYI1goDQ1JueM+G1fS9Nkki+5zHJPUh8WiyD7+aZ+jxkPgE351l+fuU0GXwtWghNtGF nMOB4/7uYiy2X9BaetIVk83jk/vOfG43D8+ehSWMinpQUgnZrIzS9cyRyClEcxQRBl9Fcm53WdP +ou15H4LKw+A8fX7vpAC+NAxiBZIXpdUYw0hAmkl6LH9nI8O5n/EE6rH6fKmgyw51Gv/dvOjWeU maGZDx4A8Z1gf22Eso44bsEadWbu5ZyO+M/wMmGng77bkjgzB1InF+WV4Zk3d5pgLGzqGwja9xx tGdKS9brV/3N5hpr0WVf2h9y3/89lcTbFRROrBQRTRNA3DVgVuB3BtysoWv6d1uJJ2MGEKVASKC 4QFCv2ExPwaxMNpshvSrvZmhEtAR/FeF0KkOwatrQuYG636gwfSKYF8begNUHkS4jKJ4lwO5eBK 0j8C9CsCEkxr8IK/gfw== X-Proofpoint-ORIG-GUID: sqCx9PLbBFkMjru_J-ReK7LyqRFOyrAE X-Authority-Analysis: v=2.4 cv=Gq5PO01C c=1 sm=1 tr=0 ts=69b0e065 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=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=3htL6sknLGLhwEng4zIA: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 suspectscore=0 malwarescore=0 bulkscore=0 lowpriorityscore=0 spamscore=0 adultscore=0 clxscore=1015 priorityscore=1501 impostorscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110026 Sort out the remaining UBWC swizzle values, using flags to control whether level 2 and level 3 swizzling are enabled or not. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/soc/qcom/ubwc_config.c | 14 +++----------- include/linux/soc/qcom/ubwc.h | 26 +++++++++++++------------- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/drivers/soc/qcom/ubwc_config.c b/drivers/soc/qcom/ubwc_config.c index 49edfabb5e18..ccee20913115 100644 --- a/drivers/soc/qcom/ubwc_config.c +++ b/drivers/soc/qcom/ubwc_config.c @@ -18,8 +18,6 @@ static const struct qcom_ubwc_cfg_data no_ubwc_data =3D { =20 static const struct qcom_ubwc_cfg_data kaanapali_data =3D { .ubwc_enc_version =3D UBWC_6_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 16, }; =20 @@ -40,7 +38,7 @@ static const struct qcom_ubwc_cfg_data qcm2290_data =3D { =20 static const struct qcom_ubwc_cfg_data sa8775p_data =3D { .ubwc_enc_version =3D UBWC_4_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL3, + .flags =3D UBWC_FLAG_DISABLE_SWIZZLE_LVL2, .highest_bank_bit =3D 13, }; =20 @@ -111,38 +109,32 @@ static const struct qcom_ubwc_cfg_data sm8150_data = =3D { =20 static const struct qcom_ubwc_cfg_data sm8250_data =3D { .ubwc_enc_version =3D UBWC_4_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, }; =20 static const struct qcom_ubwc_cfg_data sm8350_data =3D { .ubwc_enc_version =3D UBWC_4_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, }; =20 static const struct qcom_ubwc_cfg_data sm8550_data =3D { .ubwc_enc_version =3D UBWC_4_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, }; =20 static const struct qcom_ubwc_cfg_data sm8750_data =3D { .ubwc_enc_version =3D UBWC_5_0, - .ubwc_swizzle =3D 6, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, }; =20 static const struct qcom_ubwc_cfg_data glymur_data =3D { .ubwc_enc_version =3D UBWC_5_0, - .ubwc_swizzle =3D 0, + .flags =3D UBWC_FLAG_DISABLE_SWIZZLE_LVL2 | + UBWC_FLAG_DISABLE_SWIZZLE_LVL3, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, }; diff --git a/include/linux/soc/qcom/ubwc.h b/include/linux/soc/qcom/ubwc.h index 0cbd20078ada..953094b73459 100644 --- a/include/linux/soc/qcom/ubwc.h +++ b/include/linux/soc/qcom/ubwc.h @@ -14,15 +14,6 @@ struct qcom_ubwc_cfg_data { u32 ubwc_enc_version; =20 - /** - * @ubwc_swizzle: Whether to enable level 1, 2 & 3 bank swizzling. - * - * UBWC 1.0 always enables all three levels. - * UBWC 2.0 removes level 1 bank swizzling, leaving levels 2 & 3. - * UBWC 4.0 adds the optional ability to disable levels 2 & 3. - */ - u32 ubwc_swizzle; - /** * @highest_bank_bit: Highest Bank Bit * @@ -30,6 +21,10 @@ struct qcom_ubwc_cfg_data { * DDR bank. This should ideally use DRAM type detection. */ int highest_bank_bit; + + unsigned int flags; +#define UBWC_FLAG_DISABLE_SWIZZLE_LVL2 BIT(0) +#define UBWC_FLAG_DISABLE_SWIZZLE_LVL3 BIT(1) }; =20 #define UBWC_1_0 0x10000000 @@ -101,11 +96,16 @@ static inline u32 qcom_ubwc_swizzle(const struct qcom_= ubwc_cfg_data *cfg) UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3; =20 - if (cfg->ubwc_enc_version < UBWC_4_0) - return UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3; + u32 ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | + UBWC_SWIZZLE_ENABLE_LVL3; + + if (cfg->flags & UBWC_FLAG_DISABLE_SWIZZLE_LVL2) + ubwc_swizzle &=3D ~UBWC_SWIZZLE_ENABLE_LVL2; + + if (cfg->flags & UBWC_FLAG_DISABLE_SWIZZLE_LVL3) + ubwc_swizzle &=3D ~UBWC_SWIZZLE_ENABLE_LVL3; =20 - return cfg->ubwc_swizzle; + return ubwc_swizzle; } =20 static inline u32 qcom_ubwc_version_tag(const struct qcom_ubwc_cfg_data *c= fg) --=20 2.47.3 From nobody Wed Apr 8 01:18:33 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 92C7037DE80 for ; Wed, 11 Mar 2026 03:24:23 +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=1773199469; cv=none; b=kPTlOCzIviZD4FomMsQ9/TGyBqyyNrT/AMoTdc4RToSnTU7dVCqZzv7xsomzbAWu/YKrf+ZZ9ptCtNMdP8x76SpItljw4qzROYnORZyResUGl4u5Lyz/zO2ENDtg+e0yWMDShrEucHFJruJDqGfagccHnIHlAKLPwhTobBecPzM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199469; c=relaxed/simple; bh=cuqO+m9BSceBUKXzD9bGuTtW3yUhyLay2fImgUonSHI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eZxww0ME10UfLsQqB8lvTNSMz9GtFxhRpeosTsTpcDdm6vGQI0tGpYQJ121FxEEu2r4cw9e2ghWgLQaslw7kbhdF0VwiE7IFxPEFswEgfUHKCCZ+pQF8wChY1wQib8yilsdSapJVH3E4I34oiDb2I7dlf9tYeYq3VWgFdD6zTVk= 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=AtscbT91; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=a1NxzGQV; 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="AtscbT91"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="a1NxzGQV" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62B34Kd3304472 for ; Wed, 11 Mar 2026 03:24:22 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= wCF7c3TBX6o+MiU7CsW3tf4ENTO+38tQp5kbxgZiMT4=; b=AtscbT91Nw9VV5Jh CygIDwFPGhuuHK9MdkPtz0c1LllZJG2R4Ix6KMPYbhSbBUdim56Q6vFZf7MkUQWy ppOdkgzQzq+K1N1wGjMOOsgRFSXrZdjrsXPjExmzZJVKWsuU1/3dfVqpBhkepRSV M+ThEw4P/CgTL4audQTXUlnCngvB0uVv+WWvzemtyTYCxQsTmWzv185fwYY0qQfQ 9CKWziGFpwKRnt1xCtwu1K7uE5rI11XDjxpyKros7qazPCYgzKWwABbdovDrpnfs VZAByNSd8mw7XzSaugoQdOCPPzqMaFF+xadhR0VHns8ln+gjDKBscrsgTS6HI+SX wyHIWA== Received: from mail-vs1-f71.google.com (mail-vs1-f71.google.com [209.85.217.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cthjf3ery-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:24:22 +0000 (GMT) Received: by mail-vs1-f71.google.com with SMTP id ada2fe7eead31-5ffbe27449cso4776460137.0 for ; Tue, 10 Mar 2026 20:24:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199462; x=1773804262; 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=wCF7c3TBX6o+MiU7CsW3tf4ENTO+38tQp5kbxgZiMT4=; b=a1NxzGQVNI13r5Cs/eXh7qMk59/wMnUBlGUQZDjoLU+aizF4beC9XmObnPXcQURAWO w3f7IS46+iFX3qcyGOTzw4U9QxX213IxY/y+9RV3mcK0FrR657/F9VGxKjQVLq6kCS/r uOvfb7JD97rcRQGg8fQ9s60Eav+MF7G8nWfOFyeEuSxkHS1JTuKyVrKsWCrshdbK1Q36 /JooukkhlIiGMpkSfcXF8c6uHXFuQpErSgkqjbwEgVdVrOk+xzSN0nega7ug6RrU9RMR ChEBE1JdBQ4m4U6eB8Mhlzhg6pN9u0Zq7BuawJFvR/6NIUq4SRF3R/uL6I2xVWDLXb13 s63g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199462; x=1773804262; 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=wCF7c3TBX6o+MiU7CsW3tf4ENTO+38tQp5kbxgZiMT4=; b=enGjRIyOFRxMh1ReTP4idjd/OuBZQ7nQJm7y+HdR5pe7dERFnRfTtv+yHthP6/qW60 VF4VL6bz83mhN1Ty6rDt6Nu1E/86qDpXzSVcZB2ktOOgxdawXqe31PAcgIvs+/zI+ikp eYPK6Q7q6WUoOPfiXXXZEqsPiqo+cYmK1EszaGn+AukIC2YKoVu3oQFyX+PgT1gfNZd0 3E0BI9mQsLJ2l46Kvus61amSM8Bj7uw5rPBlfZNB+IiC3tBxQravwxH01uvDI1cmHNKr XNhmSup6HMfZlkrL924nAxahFUzzAjN0hs10aKVvnKcO+iK8t7juE5bx7W/ebm6YK5CF /G/g== X-Forwarded-Encrypted: i=1; AJvYcCXAn+mVoTAt8RGedu8cb6i+aF9OxoeKjGZDkycuCfgr5y+JRmo36jROXJ+4Wdvbj7hIFycVc7qcwFh7+Sw=@vger.kernel.org X-Gm-Message-State: AOJu0YybsGODX5s2JhLDERazz5J0W6rft/UL05vED0kSR0QCCydnIXAn s9RDZ6Rhfbk24XMmDfqLxtnMFiaRaokoYDtYTSAykoyAlsyT2i1inQihTiuXOqeKnWZ98CH54Sv 1dgiboyOdebAsfu88MxAAvglYe4h0Bo9gxXb3A3TdQYud1JfSwll8JP1lf7c24ekGEGw= X-Gm-Gg: ATEYQzwe6EnbUE0CD8dqejdrSfH7DCN9a1C3U0FYJLL2VwqotK4jVpikwxqrgEl+XI0 yu06Zvzgk7XQBLexdoYEucP6vQnk2UsKCZX0kbtl6RQUmiN3uarD1Ozsb2JZj8MFfcS7iVJ6oeR VTysI3rCWyooUF9blqV0n5vR0ohbVLtzsty/6nw+YVr8cDopzKilW7E1WReS897uK/Vue8g+8P1 idulaHcGfTBuyowe2AS4xaf9dqyKtpJgTO/dKA9jQ0gzfSf/mqI/5nzioFgMZXK0aI85eaNUr1F rX7fvfmLxGfXolSweE25q9GwoFaBq0xQUxBlZJ3zI0AqSGGUmXQW/fQFze9642f4xPXydEKI9Il 0Y7R60CSMxL2IXSaJ5H2xouwAklZ5IucQk22p7oPI7SBm/y17PpwqPsRWJy+/0Qr0LA/YVWgtxW pogPDWYPB2MmGBm8Yov1j2cSj/lnyStCBD6V8= X-Received: by 2002:a05:6102:3910:b0:5ff:e545:593a with SMTP id ada2fe7eead31-6003a5966ffmr2480876137.21.1773199461582; Tue, 10 Mar 2026 20:24:21 -0700 (PDT) X-Received: by 2002:a05:6102:3910:b0:5ff:e545:593a with SMTP id ada2fe7eead31-6003a5966ffmr2480866137.21.1773199461124; Tue, 10 Mar 2026 20:24:21 -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.24.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:24:20 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:23:19 +0200 Subject: [PATCH v2 25/25] soc: qcom: ubwc: deduplicate UBWC configuration data 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: <20260311-ubwc-rework-v2-25-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, Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=11102; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=cuqO+m9BSceBUKXzD9bGuTtW3yUhyLay2fImgUonSHI=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsOAhREKwJvo7jCv/CEBMykx97M6YMRoklSQVt Ddn58OtmxWJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabDgIQAKCRCLPIo+Aiko 1f2ZB/4/VxhpF+vhW9SiD8SPjfbW9w1HKjz1EcTkmfvkZD/AWIMWzOQvIo4+hqQTFjgd9+Zxjh5 JQ641QxnOKIaFvpxc0SJZi3Nd8xStBFbBlsVFFzlODdBaLiGfXtVLi15z6aHVytqO2TqwTmqoUx gAS7jIBWXIlNMVM3zVR8EQvIwFRTWtNrE7T152c+fHO2qdlTcE606pTu2L99QeVxVpgfDrsfd4n ypL46lH/ELssFihKiR7A8Gyn5M5rnMElql34ArqQ8ShKXm/bPmUut8oIM54UWS+EI7zAQaf9vgI I55JnyNgS3g0mN+61+b6v1ZZHKGfacELtx9YTHiG2QGB+VRB X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: PkCSuktAevd7Lbti4GLGjG3lOMknKiL3 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfX1pEMaBmpFPMT AYgkUQkJkjIzPE6bK+F+Pd8zq0e9m2dWYY8ZcCdv4BvdN05nRM8ZFYdPpi1a0Ez4cm3zZpkVVLr 2TekbcZC7Ze+zZaaPWkzxdGY/fVP7Q9intEUn+31qy3FvL1GX+/k3jTec06j11M/N0z5XV8OVFy Ke9TuH6ONFbkUcbbTcnwyv5UscwGOSogVP1D6VVRHMuFUpprWHxpt6nCc97vGYpaa3CicdjmKVw HQTrMgTiskWBWRUAYxw2R2P7mAzzaI2vgGmKshbjgvJ5MPRoxpxPJ8jR9SMJWZLEKAJgBLtTwcP yDfjWUl30viWvjE8bswV6e5W6+1ZX8mX0+T5bUBCIFPFgTpkSBsKvS9wXpzpogDKspCcthELW7O /aEnXJDaTzTs+dmUQYhsgw2EUEQwZ9KETva2uD6glXlC7LJ4rEUE5LddCM2sDMCMdPjb5BSGyc0 9yiTprbYt/iMgvtS1QA== X-Authority-Analysis: v=2.4 cv=A71h/qWG c=1 sm=1 tr=0 ts=69b0e066 cx=c_pps a=P2rfLEam3zuxRRdjJWA2cw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=f57iFBScQPT45aafJKQA:9 a=QEXdDO2ut3YA:10 a=ODZdjJIeia2B_SHc_B0f:22 X-Proofpoint-ORIG-GUID: PkCSuktAevd7Lbti4GLGjG3lOMknKiL3 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 impostorscore=0 phishscore=0 clxscore=1015 suspectscore=0 bulkscore=0 adultscore=0 spamscore=0 lowpriorityscore=0 priorityscore=1501 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110026 After removing all extra entries from the UBWC database it is easy to define generic entries, common for all machine classes. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/soc/qcom/ubwc_config.c | 189 +++++++++++++++----------------------= ---- 1 file changed, 70 insertions(+), 119 deletions(-) diff --git a/drivers/soc/qcom/ubwc_config.c b/drivers/soc/qcom/ubwc_config.c index ccee20913115..2ee40a26ec68 100644 --- a/drivers/soc/qcom/ubwc_config.c +++ b/drivers/soc/qcom/ubwc_config.c @@ -16,119 +16,70 @@ static const struct qcom_ubwc_cfg_data no_ubwc_data = =3D { /* no UBWC, no HBB */ }; =20 -static const struct qcom_ubwc_cfg_data kaanapali_data =3D { - .ubwc_enc_version =3D UBWC_6_0, - .highest_bank_bit =3D 16, +static const struct qcom_ubwc_cfg_data ubwc_0_0_hbb15 =3D { + /* no UBWC */ + .highest_bank_bit =3D 15, }; =20 -static const struct qcom_ubwc_cfg_data msm8937_data =3D { +static const struct qcom_ubwc_cfg_data ubwc_1_0_hbb14 =3D { .ubwc_enc_version =3D UBWC_1_0, .highest_bank_bit =3D 14, }; =20 -static const struct qcom_ubwc_cfg_data msm8998_data =3D { +static const struct qcom_ubwc_cfg_data ubwc_1_0_hbb15 =3D { .ubwc_enc_version =3D UBWC_1_0, .highest_bank_bit =3D 15, }; =20 -static const struct qcom_ubwc_cfg_data qcm2290_data =3D { - /* no UBWC */ - .highest_bank_bit =3D 15, -}; - -static const struct qcom_ubwc_cfg_data sa8775p_data =3D { - .ubwc_enc_version =3D UBWC_4_0, - .flags =3D UBWC_FLAG_DISABLE_SWIZZLE_LVL2, - .highest_bank_bit =3D 13, -}; - -static const struct qcom_ubwc_cfg_data sar2130p_data =3D { - .ubwc_enc_version =3D UBWC_3_1, - .highest_bank_bit =3D 13, -}; - -static const struct qcom_ubwc_cfg_data sc7180_data =3D { +static const struct qcom_ubwc_cfg_data ubwc_2_0_hbb14 =3D { .ubwc_enc_version =3D UBWC_2_0, .highest_bank_bit =3D 14, }; =20 -static const struct qcom_ubwc_cfg_data sc7280_data =3D { - .ubwc_enc_version =3D UBWC_3_1, - .highest_bank_bit =3D 14, -}; - -static const struct qcom_ubwc_cfg_data sc8180x_data =3D { - .ubwc_enc_version =3D UBWC_3_0, - .highest_bank_bit =3D 16, -}; - -static const struct qcom_ubwc_cfg_data sc8280xp_data =3D { - .ubwc_enc_version =3D UBWC_4_0, - .highest_bank_bit =3D 16, -}; - -static const struct qcom_ubwc_cfg_data sdm670_data =3D { - .ubwc_enc_version =3D UBWC_2_0, - .highest_bank_bit =3D 14, -}; - -static const struct qcom_ubwc_cfg_data sdm845_data =3D { +static const struct qcom_ubwc_cfg_data ubwc_2_0_hbb15 =3D { .ubwc_enc_version =3D UBWC_2_0, .highest_bank_bit =3D 15, }; =20 -static const struct qcom_ubwc_cfg_data sm6115_data =3D { - .ubwc_enc_version =3D UBWC_1_0, - .highest_bank_bit =3D 14, -}; - -static const struct qcom_ubwc_cfg_data sm6125_data =3D { - .ubwc_enc_version =3D UBWC_1_0, - .highest_bank_bit =3D 14, +static const struct qcom_ubwc_cfg_data ubwc_3_0_hbb15 =3D { + .ubwc_enc_version =3D UBWC_3_0, + .highest_bank_bit =3D 15, }; =20 -static const struct qcom_ubwc_cfg_data sm6150_data =3D { - .ubwc_enc_version =3D UBWC_2_0, - .highest_bank_bit =3D 14, +static const struct qcom_ubwc_cfg_data ubwc_3_0_hbb16 =3D { + .ubwc_enc_version =3D UBWC_3_0, + .highest_bank_bit =3D 16, }; =20 -static const struct qcom_ubwc_cfg_data sm6350_data =3D { - .ubwc_enc_version =3D UBWC_2_0, - .highest_bank_bit =3D 14, +static const struct qcom_ubwc_cfg_data ubwc_3_1_hbb13 =3D { + .ubwc_enc_version =3D UBWC_3_1, + .highest_bank_bit =3D 13, }; =20 -static const struct qcom_ubwc_cfg_data sm7150_data =3D { - .ubwc_enc_version =3D UBWC_2_0, +static const struct qcom_ubwc_cfg_data ubwc_3_1_hbb14 =3D { + .ubwc_enc_version =3D UBWC_3_1, .highest_bank_bit =3D 14, }; =20 -static const struct qcom_ubwc_cfg_data sm8150_data =3D { - .ubwc_enc_version =3D UBWC_3_0, - .highest_bank_bit =3D 15, -}; - -static const struct qcom_ubwc_cfg_data sm8250_data =3D { +static const struct qcom_ubwc_cfg_data ubwc_4_0_hbb16 =3D { .ubwc_enc_version =3D UBWC_4_0, - /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, }; =20 -static const struct qcom_ubwc_cfg_data sm8350_data =3D { - .ubwc_enc_version =3D UBWC_4_0, - /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ +static const struct qcom_ubwc_cfg_data ubwc_5_0_hbb16 =3D { + .ubwc_enc_version =3D UBWC_5_0, .highest_bank_bit =3D 16, }; =20 -static const struct qcom_ubwc_cfg_data sm8550_data =3D { - .ubwc_enc_version =3D UBWC_4_0, - /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ +static const struct qcom_ubwc_cfg_data ubwc_6_0_hbb16 =3D { + .ubwc_enc_version =3D UBWC_6_0, .highest_bank_bit =3D 16, }; =20 -static const struct qcom_ubwc_cfg_data sm8750_data =3D { - .ubwc_enc_version =3D UBWC_5_0, - /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ - .highest_bank_bit =3D 16, +static const struct qcom_ubwc_cfg_data sa8775p_data =3D { + .ubwc_enc_version =3D UBWC_4_0, + .flags =3D UBWC_FLAG_DISABLE_SWIZZLE_LVL2, + .highest_bank_bit =3D 13, }; =20 static const struct qcom_ubwc_cfg_data glymur_data =3D { @@ -143,59 +94,59 @@ static const struct of_device_id qcom_ubwc_configs[] _= _maybe_unused =3D { { .compatible =3D "qcom,apq8016", .data =3D &no_ubwc_data }, { .compatible =3D "qcom,apq8026", .data =3D &no_ubwc_data }, { .compatible =3D "qcom,apq8074", .data =3D &no_ubwc_data }, - { .compatible =3D "qcom,apq8096", .data =3D &msm8998_data }, - { .compatible =3D "qcom,kaanapali", .data =3D &kaanapali_data, }, + { .compatible =3D "qcom,apq8096", .data =3D &ubwc_1_0_hbb15 }, + { .compatible =3D "qcom,kaanapali", .data =3D &ubwc_6_0_hbb16 }, { .compatible =3D "qcom,glymur", .data =3D &glymur_data}, { .compatible =3D "qcom,msm8226", .data =3D &no_ubwc_data }, { .compatible =3D "qcom,msm8916", .data =3D &no_ubwc_data }, { .compatible =3D "qcom,msm8917", .data =3D &no_ubwc_data }, - { .compatible =3D "qcom,msm8937", .data =3D &msm8937_data }, + { .compatible =3D "qcom,msm8937", .data =3D &ubwc_1_0_hbb14 }, { .compatible =3D "qcom,msm8929", .data =3D &no_ubwc_data }, { .compatible =3D "qcom,msm8939", .data =3D &no_ubwc_data }, - { .compatible =3D "qcom,msm8953", .data =3D &msm8937_data }, + { .compatible =3D "qcom,msm8953", .data =3D &ubwc_1_0_hbb14 }, { .compatible =3D "qcom,msm8956", .data =3D &no_ubwc_data }, { .compatible =3D "qcom,msm8974", .data =3D &no_ubwc_data }, { .compatible =3D "qcom,msm8976", .data =3D &no_ubwc_data }, - { .compatible =3D "qcom,msm8996", .data =3D &msm8998_data }, - { .compatible =3D "qcom,msm8998", .data =3D &msm8998_data }, - { .compatible =3D "qcom,qcm2290", .data =3D &qcm2290_data, }, - { .compatible =3D "qcom,qcm6490", .data =3D &sc7280_data, }, - { .compatible =3D "qcom,qcs8300", .data =3D &sc8280xp_data, }, - { .compatible =3D "qcom,sa8155p", .data =3D &sm8150_data, }, - { .compatible =3D "qcom,sa8540p", .data =3D &sc8280xp_data, }, + { .compatible =3D "qcom,msm8996", .data =3D &ubwc_1_0_hbb15 }, + { .compatible =3D "qcom,msm8998", .data =3D &ubwc_1_0_hbb15 }, + { .compatible =3D "qcom,qcm2290", .data =3D &ubwc_0_0_hbb15, }, + { .compatible =3D "qcom,qcm6490", .data =3D &ubwc_3_1_hbb14, }, + { .compatible =3D "qcom,qcs8300", .data =3D &ubwc_4_0_hbb16, }, + { .compatible =3D "qcom,sa8155p", .data =3D &ubwc_3_0_hbb15, }, + { .compatible =3D "qcom,sa8540p", .data =3D &ubwc_4_0_hbb16, }, { .compatible =3D "qcom,sa8775p", .data =3D &sa8775p_data, }, - { .compatible =3D "qcom,sar2130p", .data =3D &sar2130p_data }, - { .compatible =3D "qcom,sc7180", .data =3D &sc7180_data }, - { .compatible =3D "qcom,sc7280", .data =3D &sc7280_data, }, - { .compatible =3D "qcom,sc8180x", .data =3D &sc8180x_data, }, - { .compatible =3D "qcom,sc8280xp", .data =3D &sc8280xp_data, }, - { .compatible =3D "qcom,sda660", .data =3D &msm8937_data }, - { .compatible =3D "qcom,sdm450", .data =3D &msm8937_data }, - { .compatible =3D "qcom,sdm630", .data =3D &msm8937_data }, - { .compatible =3D "qcom,sdm632", .data =3D &msm8937_data }, - { .compatible =3D "qcom,sdm636", .data =3D &msm8937_data }, - { .compatible =3D "qcom,sdm660", .data =3D &msm8937_data }, - { .compatible =3D "qcom,sdm670", .data =3D &sdm670_data, }, - { .compatible =3D "qcom,sdm845", .data =3D &sdm845_data, }, - { .compatible =3D "qcom,sm4250", .data =3D &sm6115_data, }, - { .compatible =3D "qcom,sm6115", .data =3D &sm6115_data, }, - { .compatible =3D "qcom,sm6125", .data =3D &sm6125_data, }, - { .compatible =3D "qcom,sm6150", .data =3D &sm6150_data, }, - { .compatible =3D "qcom,sm6350", .data =3D &sm6350_data, }, - { .compatible =3D "qcom,sm6375", .data =3D &sm6350_data, }, - { .compatible =3D "qcom,sm7125", .data =3D &sc7180_data }, - { .compatible =3D "qcom,sm7150", .data =3D &sm7150_data, }, - { .compatible =3D "qcom,sm7225", .data =3D &sm6350_data, }, - { .compatible =3D "qcom,sm7325", .data =3D &sc7280_data, }, - { .compatible =3D "qcom,sm8150", .data =3D &sm8150_data, }, - { .compatible =3D "qcom,sm8250", .data =3D &sm8250_data, }, - { .compatible =3D "qcom,sm8350", .data =3D &sm8350_data, }, - { .compatible =3D "qcom,sm8450", .data =3D &sm8350_data, }, - { .compatible =3D "qcom,sm8550", .data =3D &sm8550_data, }, - { .compatible =3D "qcom,sm8650", .data =3D &sm8550_data, }, - { .compatible =3D "qcom,sm8750", .data =3D &sm8750_data, }, - { .compatible =3D "qcom,x1e80100", .data =3D &sm8550_data, }, - { .compatible =3D "qcom,x1p42100", .data =3D &sm8550_data, }, + { .compatible =3D "qcom,sar2130p", .data =3D &ubwc_3_1_hbb13 }, + { .compatible =3D "qcom,sc7180", .data =3D &ubwc_2_0_hbb14, }, + { .compatible =3D "qcom,sc7280", .data =3D &ubwc_3_1_hbb14, }, + { .compatible =3D "qcom,sc8180x", .data =3D &ubwc_3_0_hbb16, }, + { .compatible =3D "qcom,sc8280xp", .data =3D &ubwc_4_0_hbb16, }, + { .compatible =3D "qcom,sda660", .data =3D &ubwc_1_0_hbb14 }, + { .compatible =3D "qcom,sdm450", .data =3D &ubwc_1_0_hbb14 }, + { .compatible =3D "qcom,sdm630", .data =3D &ubwc_1_0_hbb14 }, + { .compatible =3D "qcom,sdm632", .data =3D &ubwc_1_0_hbb14 }, + { .compatible =3D "qcom,sdm636", .data =3D &ubwc_1_0_hbb14 }, + { .compatible =3D "qcom,sdm660", .data =3D &ubwc_1_0_hbb14 }, + { .compatible =3D "qcom,sdm670", .data =3D &ubwc_2_0_hbb14, }, + { .compatible =3D "qcom,sdm845", .data =3D &ubwc_2_0_hbb15, }, + { .compatible =3D "qcom,sm4250", .data =3D &ubwc_1_0_hbb14, }, + { .compatible =3D "qcom,sm6115", .data =3D &ubwc_1_0_hbb14, }, + { .compatible =3D "qcom,sm6125", .data =3D &ubwc_1_0_hbb14, }, + { .compatible =3D "qcom,sm6150", .data =3D &ubwc_2_0_hbb14, }, + { .compatible =3D "qcom,sm6350", .data =3D &ubwc_2_0_hbb14, }, + { .compatible =3D "qcom,sm6375", .data =3D &ubwc_2_0_hbb14, }, + { .compatible =3D "qcom,sm7125", .data =3D &ubwc_2_0_hbb14, }, + { .compatible =3D "qcom,sm7150", .data =3D &ubwc_2_0_hbb14, }, + { .compatible =3D "qcom,sm7225", .data =3D &ubwc_2_0_hbb14, }, + { .compatible =3D "qcom,sm7325", .data =3D &ubwc_3_1_hbb14, }, + { .compatible =3D "qcom,sm8150", .data =3D &ubwc_3_0_hbb15, }, + { .compatible =3D "qcom,sm8250", .data =3D &ubwc_4_0_hbb16, }, + { .compatible =3D "qcom,sm8350", .data =3D &ubwc_4_0_hbb16, }, + { .compatible =3D "qcom,sm8450", .data =3D &ubwc_4_0_hbb16, }, + { .compatible =3D "qcom,sm8550", .data =3D &ubwc_4_0_hbb16, }, + { .compatible =3D "qcom,sm8650", .data =3D &ubwc_4_0_hbb16, }, + { .compatible =3D "qcom,sm8750", .data =3D &ubwc_5_0_hbb16, }, + { .compatible =3D "qcom,x1e80100", .data =3D &ubwc_4_0_hbb16, }, + { .compatible =3D "qcom,x1p42100", .data =3D &ubwc_4_0_hbb16, }, { } }; =20 --=20 2.47.3