From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 45450FD88EC for ; Wed, 11 Mar 2026 03:24:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9731610E7E7; Wed, 11 Mar 2026 03:24:21 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="ntjZcPHD"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="NLip3C+J"; dkim-atps=neutral Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3722910E7ED for ; Wed, 11 Mar 2026 03:24:19 +0000 (UTC) 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 62AIZIGo3296707 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-ua1-f69.google.com (mail-ua1-f69.google.com [209.85.222.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctg1musfy-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-ua1-f69.google.com with SMTP id a1e0cc1a2514c-94ac3fcea3bso130439963241.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=lists.freedesktop.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=+xGen/0FzexLqmKExWBIL2m3ElpzS8KM21Ro0B4OQGs=; b=NLip3C+Jh8u0Ms52cBpEFV6g6nq3j8nLpNmafsq1lMJ1T33bEuepCXsC9w7Q87gb9d 2b8HG9J7P9t79VxdT3W7unt7MeKKJJZO/9w+HrJ3fnJzKBbuKghW+qIdBtQgd2m8e2V5 6/Ax+vQFvQN9FtiD8sPy8c+hOuHZ3ruBsFltIlEbqIzTStPNzqFxNR8XWWgA9JV5wHcO b+/X/FgZKcc2gMJbeCCEvbmHV4Tv5g5qSj1nCUQqQrbSHMSJQVERBTKJ0DIXMLpt9qcP OH8HmMK1AWYm9kdJhqcCVJegU6sBJeIj7fDjf+LsEheQ43pesDmAfqZi7E7HMES10cBf J6qA== 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=WjoCpP/z0iRVLBHwFKrbPGmu7AY//S092TsMLYSb/3E9CKtDewzo9vsi39H5QvRrCW jb9BWhpH20gKBMTX1Gi7P/38yLYUd0DZAwMtA2teemjP0jX6FSeTVaHkYGvXzGv+l/s6 2F6vMWGaHYOPKn2FD+Se/e8evt/bAW2WNKTiDwVIyxVUC4cc9G6L7gftUP2nJWO0HASU 8NzHdqCAfZOM1gaZPPgpThznuz7nfnS//eqPAXCtpMRmQbG9KbXb7E5Mmq1nAnXIkKAg IRl1KH2gzibQ+AsZ23q9yyA2nqQEPwvrKdj7qdyFLFDHVLG2y275hnSnivmK6bKAKVac a1Ww== X-Forwarded-Encrypted: i=1; AJvYcCU8sDV6VZVuwM2xS5BTcqwJPMeK0bCXDxb6L/WrsmpKUPcdEJgYdix7y1HGLJUd2Y++JWspdx4Soko=@lists.freedesktop.org X-Gm-Message-State: AOJu0YxgX3QDh0uw2SFNXbmtafWKsyd5HNsRjp1UtM1Dhjx+glOm8UAT Sevi18fmr7lIvNhjeJw+2V3wA0NOcFuAVBNLr6z7U9t1a3VsV8GcaRlhiqc297K6XF4CGqvKlgr WqxAVD8ajkYIhy4B129xAlAQhcWyFfheg+kipNAKfM1FOVoKJ1aAqU2UM/iW6qDBWrqRQRVk= X-Gm-Gg: ATEYQzxi6lKCkIDEGjJeDhSddDxHkpy1jBxAlrTdi9rY37SuREsbfvK4EWO1UdBe0Lj hM0xxPGprsN60y3tBnZyEyKSmOP6ZZQnfP2qA5KSq2b/Q2SQu4/wasL1ywC2YV5YB7sFk3l58Vd nPKlbcpYtGK5c6inKUJ5PELYzC6UA0SgBX6WwwuJmuWe0vgK5gRI8e91DAcxwE5XbKz02WjowK1 V7TsZRe+5Zp2MCBUwmipNv3jjGuaesYyN3adFJar33FSFmnKkaM8CTGhSrYMOu+x1X/8Scddscf JRKDzK0yt1+qek/n9Gy/+JlZSlAT+eNP/vwGP09WRz5Pv8XLdti9OvRkD3oBdOolLxQtGU5pOUc 8/AQgCOvzfnhw6J+Xb+tcD2ku/V93IYN5JTtAYi0D1+DzGyyLZAHSo4eCbP60SmMiCn6CR4BgCL rawNAkA6dTtwGQUFSFmQHXpsZrhrmcIczwXdY= X-Received: by 2002:a05:6102:512b:b0:5db:ca9e:b57d with SMTP id ada2fe7eead31-601def4f45emr498307137.19.1773199457530; 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 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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-Authority-Analysis: v=2.4 cv=YOeSCBGx c=1 sm=1 tr=0 ts=69b0e062 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=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=8a_ODPMxA7UucN5sxwIA:9 a=QEXdDO2ut3YA:10 a=TOPH6uDL9cOC6tEoww4z:22 X-Proofpoint-ORIG-GUID: BRUfMm7ayx5G4t4mpKUmQeH-C3ml1jA0 X-Proofpoint-GUID: BRUfMm7ayx5G4t4mpKUmQeH-C3ml1jA0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfXygm3En2UDyjJ NY2268UelYqQ7B1hrc1+Nwrqq+kRKG6LEBXFvfUBoDPpOMqY03hQjfg1uklszO81c80qfZHkJQx JuZPqX4YGBuOkKKeeZWeIhwqDBQXq7cW4X0aj5hDY6qiahzpmzoGc3QTh0QFgJVqSX1vMARmzja H9C4enHhLhKflZhRrailJ10rD0YocKbUMLar2GkBM+G0C2cQD65a5mQ96/9Btcap7BxnVwVyO7k ftXtS2EpOIgX+i+H3d538FxF+5x4xCPk7REkYtEhD8XPg9+OhCljNVrRGnwQQp70q2Vj0kNSUJe T5tt7P/bF4p4dB1aezIUJYKJarFbuy0RUKxP1WFnBg80xizM13JlYVDa67jFQTBXKetptC0hiKF cMmTGGD/U1/Z1HUtWhERt5S2obrSCEITxljcoe+NDdUGr4YOfKouzSji4NeGlBKEIS3hQ4SB1qM 3vnKTAon/4Yf8qJtIZw== 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 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 = { static const struct qcom_ubwc_cfg_data msm8937_data = { .ubwc_enc_version = UBWC_1_0, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL1 | - UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit = 14, }; static const struct qcom_ubwc_cfg_data msm8998_data = { .ubwc_enc_version = UBWC_1_0, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL1 | - UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit = 15, }; @@ -52,94 +46,66 @@ static const struct qcom_ubwc_cfg_data sa8775p_data = { static const struct qcom_ubwc_cfg_data sar2130p_data = { .ubwc_enc_version = UBWC_3_1, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit = 13, }; static const struct qcom_ubwc_cfg_data sc7180_data = { .ubwc_enc_version = UBWC_2_0, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit = 14, }; static const struct qcom_ubwc_cfg_data sc7280_data = { .ubwc_enc_version = UBWC_3_1, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit = 14, }; static const struct qcom_ubwc_cfg_data sc8180x_data = { .ubwc_enc_version = UBWC_3_0, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit = 16, }; static const struct qcom_ubwc_cfg_data sc8280xp_data = { .ubwc_enc_version = UBWC_4_0, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit = 16, }; static const struct qcom_ubwc_cfg_data sdm670_data = { .ubwc_enc_version = UBWC_2_0, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit = 14, }; static const struct qcom_ubwc_cfg_data sdm845_data = { .ubwc_enc_version = UBWC_2_0, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit = 15, }; static const struct qcom_ubwc_cfg_data sm6115_data = { .ubwc_enc_version = UBWC_1_0, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL1 | - UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit = 14, }; static const struct qcom_ubwc_cfg_data sm6125_data = { .ubwc_enc_version = UBWC_1_0, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL1 | - UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit = 14, }; static const struct qcom_ubwc_cfg_data sm6150_data = { .ubwc_enc_version = UBWC_2_0, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit = 14, }; static const struct qcom_ubwc_cfg_data sm6350_data = { .ubwc_enc_version = UBWC_2_0, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit = 14, }; static const struct qcom_ubwc_cfg_data sm7150_data = { .ubwc_enc_version = UBWC_2_0, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit = 14, }; static const struct qcom_ubwc_cfg_data sm8150_data = { .ubwc_enc_version = UBWC_3_0, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit = 15, }; 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) /** * @highest_bank_bit: Highest Bank Bit @@ -55,12 +52,7 @@ static inline const struct qcom_ubwc_cfg_data *qcom_ubwc_config_get_data(void) static inline bool qcom_ubwc_get_ubwc_mode(const struct qcom_ubwc_cfg_data *cfg) { - bool ret = cfg->ubwc_enc_version == 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 == UBWC_1_0; } /* @@ -88,8 +80,31 @@ static inline bool qcom_ubwc_bank_spread(const struct qcom_ubwc_cfg_data *cfg) return true; } +#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 == 0) + return 0; + + if (cfg->ubwc_enc_version == 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; } -- 2.47.3