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 C049EFCB622 for ; Fri, 6 Mar 2026 16:47:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2645510EE09; Fri, 6 Mar 2026 16:47:58 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="LiZ2bxYL"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="TsIxRB1B"; 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 1C04010EDFE for ; Fri, 6 Mar 2026 16:47:53 +0000 (UTC) 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 626FqwFp082499 for ; Fri, 6 Mar 2026 16:47: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= cZb8eZw+Q83o+RlHHgWXaiw17CCH07r6st3FY/t2sq8=; b=LiZ2bxYLzVssMrjQ dwtQ6ZtcQ4t6ddMaCjo4d7gdEsCbn9iR82OtxuasTZtEIhnfQY6/RIGT/N2yEFNp 6qj2VIFaMWgAEnYoJfW9rxw3lerXUmkrEziC0DTWV28eBoOEz4U4lhYiXHKj3ArS csoLIY5O3spFkHqNw9RwO/8rtViW7PAU9CAjVps/YGg0t6zMTx49zH1RCCgfbBfD KyiFo2rHTC9KwlwMjWE1JRCaZHn02tYfSOM7OiPGlhq/Si5lW5FJ4Nj2gluxSNuq Z9RBMxl/QfP3gtdafRSldV+SAuWtsGVhi4AiA0Ejo3IX1HH8b/3p5kG6vyv9Okla BFIFDw== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cqv98hc2d-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 06 Mar 2026 16:47:52 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-8cb3d11b913so5171721685a.1 for ; Fri, 06 Mar 2026 08:47:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1772815672; x=1773420472; 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=cZb8eZw+Q83o+RlHHgWXaiw17CCH07r6st3FY/t2sq8=; b=TsIxRB1BmlvbvGEpuN4Q2xF/EtOhwTVy6o1AUPjbu5tTBJcvH8UtvRVJWoNnZ/milN +LMQBPrpeXL1MNNPkZY7auOnSmeIGHSl8V9/g/iBCuDsx3NOoiFMfPSAtQTVNu3SgMJI 7NiSpFFQhsYJabRiPEuV5qwpIGH/qBt7ZqOOE2E5bG0uTVQEbJgkDbsCJ89siCDTJxTy MNl6f6j3IPI9aKvBi4aq18ltG0E2ANYU23bRCo09yYae9aseAN32KXLJgmnkM+calrkw tXybh/eU+KWtPlgu/d7l7mUY4xf6k/VZXvpXaqoc07sVIFRvw7lwuvWC0zjs6/fPZDcy k/4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772815672; x=1773420472; 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=cZb8eZw+Q83o+RlHHgWXaiw17CCH07r6st3FY/t2sq8=; b=Dp5OqKIZu7L0yT6NzwWHALTbQLJJjcEih8uC6KXM9rYbw77tolRNiKnMma5wTQDfuO by6+pgrSlvjPdhr/PboqMCYCNyVoKqN5gudrAVMyzEoOLIT0MHetrcG4HHZhah7X8vLK pK27PbBjK3zKJoF+Sj+8/olExJBkFuOczqfXdxAzX+m0gpDKrQJp78TwLDganKDhlk4x 5GYddfciDk/r9rxnZLVXVFkYjsYDvYefLCOIl07vgESsrLBFQRrDbSDzvXQ0bWclZbbv bH1QwOx8PoF+6hizk5ooeMforZL+LYsymCWpF6ml6H9urW6OkPC/e8k6nO4YkglfM03I nn0w== X-Forwarded-Encrypted: i=1; AJvYcCUvg1tjXHqllwlFYgBEpjezMXSW8vRpEd+fL5ZUVkdt660wxd6bU54QheA0iGG46HLoIWBQKagdG2Q=@lists.freedesktop.org X-Gm-Message-State: AOJu0YwRZ4VkAZyX83vAo5gPNce8gWhyqweuHJyr7sB9h8f6GS6GRT7n sAJbPaIOa/8MjFVFHqDSP5TbLDoPF3MNg3MhTUJpbQrZVkrTLhGarkBabu6uvxOYbj79USS1iWb +vOoMfRc5FxwzNW7mZ3RP3qs4lcGcsU6ubBi73KuP2ADwYKuyR+9u69UXuItuItoA2qaTLxI= X-Gm-Gg: ATEYQzyXOSMdF7BPNpQr8Aq7xHBHSZ6AqAORitrAeI+OWcekUMWTlQrDP764/uH/lKs GP0gOtC/9r9TVIsM+QO0INnrEAAR2i/1HqQAKCLmowiWfMq0E/uM5yaOBXWxy1uILVAbJMPjCsu SjOAqRQpN53wug91iSQcQKsdTT7U2Qi7DDrvAIYzmxbjo8YESwZGUaJhHRsEf9N8MuFhu3cfIy3 V0wv5gD8qvX4opKKPRPEGUU/NvfqKr+rq+zDgQD+VOJR3C8oYJaYE3cQnUMzOWqzrrq86ltOBry YV8q49Z9qDjMjEO5y4SBtCHV3aVU5nocJEv9zRr4g1c+OHnQTzbbD4Efz5sWlxFn7V7/dbG61P2 QkfBDIbF3ZbQcTNLcJToEonOaZTfsz7YKH3Fp9IJC2eqQqOBeqihif0cary3WxkcnhFY/Ip9gIE 04ox1chrYf5m+V/jHseTRDjFcoRNK0hO2laEI= X-Received: by 2002:a05:620a:450e:b0:8c7:19f4:b585 with SMTP id af79cd13be357-8cd6d437e12mr357962485a.43.1772815671556; Fri, 06 Mar 2026 08:47:51 -0800 (PST) X-Received: by 2002:a05:620a:450e:b0:8c7:19f4:b585 with SMTP id af79cd13be357-8cd6d437e12mr357957685a.43.1772815671045; Fri, 06 Mar 2026 08:47:51 -0800 (PST) Received: from umbar.lan (2001-14ba-a073-af00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a073:af00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5a13eaebd0asm213804e87.51.2026.03.06.08.47.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2026 08:47:50 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 06 Mar 2026 18:47:29 +0200 Subject: [PATCH 23/24] soc: qcom: ubwc: sort out the rest of the UBWC swizzle settings MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260306-ubwc-rework-v1-23-9cfdff12f2bb@oss.qualcomm.com> References: <20260306-ubwc-rework-v1-0-9cfdff12f2bb@oss.qualcomm.com> In-Reply-To: <20260306-ubwc-rework-v1-0-9cfdff12f2bb@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=4110; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=8WidFnFU6pX9ecJLzeiZrTJ8KzhlV2H6Mjpf2nc28Pk=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpqwUQAZ+0aWPY3IVYykrhRri6p7g+LTvnjvKP6 ufdhY52g+yJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaasFEAAKCRCLPIo+Aiko 1WrJB/0eS0DHsvjpFfzh4DNP0t5Gk/kPiCgl8jnqQExo+9O/doJAZffcqd/dT4qe22aibnWMn6E VTgdGYhjRrKycFpmz/JpnDz+5YABXYX6ABlXi55nugrW1JVtxQUmhRSDsRn3aCEtf2zafBZlBq7 OuDu67brybndsSHN4tV/NERdu/ww2CF8HaQmPBM+6Kv741dx8X0pMWWcI3ImuhE4uzGwai3iMuH +9aWnuJUYxjrHaHKO7fT4UFV/HFFVx1gD9EyMTr9/khOokC8QlQZXRbiSQPbLDxVrtLqqbRYQho vD2z9Fi+LabuDcuYVkaLHIm3RpLEmgyqoPGuQa6BjuTNAVs6 X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: PMQxwcLZuH2h4N0F1CC4M-Gkbv6q1Nk- X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA2MDE1OSBTYWx0ZWRfXw1OP2xPomM8L pU1O4iZw6BoJd7a/+t6fzak+RgIk7PYWS9myYeQKQJfe6++OTyQWLLDi3XoyavV62TNvUoGpV5B xMAsf1R6eRQ9lvruMajJe3t5bIisE5SSR6aai6qje24q7W8xXONru6s3IlTqq10UF4k8ftfk8UD ixHIUj0nN52Wfan8MRVCz7sBEEH9kA3BaHE2FkGgWwUIrvD0kh0j4Ayd0xWYoGCWtKk7od4hmdj oDGY4eNOSAM5rFmxhJ8bO7dmZ+3WZqMdGQLlhx4iqv6ESRoOxVjaR/SmEWP0WzbrTgZjdZIz3jk qTcRl//vpMEpMluHzJRG8R6sknqKCPXrQZ+LIMJeU0usKhhwi9dNuo3Wmrkz3ySQAXAc0vlN0ho LdVsyq+rFiSL0mZzVrw86QD3iZ0lA0dqC6kcTqVr97bKJ5VRQvUNXOxkLhZS8RgKkLFhYoEWCWO wJERJeQrQ7+q5wPYNqQ== X-Authority-Analysis: v=2.4 cv=LbcxKzfi c=1 sm=1 tr=0 ts=69ab0538 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==: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=SdgSTUjA-qPM3NZmnp0A:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-ORIG-GUID: PMQxwcLZuH2h4N0F1CC4M-Gkbv6q1Nk- 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-06_05,2026-03-06_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 spamscore=0 priorityscore=1501 bulkscore=0 clxscore=1015 phishscore=0 adultscore=0 malwarescore=0 impostorscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603060159 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" Sort out the remaining UBWC swizzle values, using flags to control whether level 2 and level 3 swizzling are enabled or not. 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 = { static const struct qcom_ubwc_cfg_data kaanapali_data = { .ubwc_enc_version = UBWC_6_0, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit = 16, }; @@ -40,7 +38,7 @@ static const struct qcom_ubwc_cfg_data qcm2290_data = { static const struct qcom_ubwc_cfg_data sa8775p_data = { .ubwc_enc_version = UBWC_4_0, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL3, + .flags = UBWC_FLAG_DISABLE_SWIZZLE_LVL2, .highest_bank_bit = 13, }; @@ -111,38 +109,32 @@ static const struct qcom_ubwc_cfg_data sm8150_data = { static const struct qcom_ubwc_cfg_data sm8250_data = { .ubwc_enc_version = UBWC_4_0, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit = 15 for LP_DDR4 */ .highest_bank_bit = 16, }; static const struct qcom_ubwc_cfg_data sm8350_data = { .ubwc_enc_version = UBWC_4_0, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit = 15 for LP_DDR4 */ .highest_bank_bit = 16, }; static const struct qcom_ubwc_cfg_data sm8550_data = { .ubwc_enc_version = UBWC_4_0, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit = 15 for LP_DDR4 */ .highest_bank_bit = 16, }; static const struct qcom_ubwc_cfg_data sm8750_data = { .ubwc_enc_version = UBWC_5_0, - .ubwc_swizzle = 6, /* TODO: highest_bank_bit = 15 for LP_DDR4 */ .highest_bank_bit = 16, }; static const struct qcom_ubwc_cfg_data glymur_data = { .ubwc_enc_version = UBWC_5_0, - .ubwc_swizzle = 0, + .flags = UBWC_FLAG_DISABLE_SWIZZLE_LVL2 | + UBWC_FLAG_DISABLE_SWIZZLE_LVL3, /* TODO: highest_bank_bit = 15 for LP_DDR4 */ .highest_bank_bit = 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; - /** - * @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) }; #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; - if (cfg->ubwc_enc_version < UBWC_4_0) - return UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3; + u32 ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | + UBWC_SWIZZLE_ENABLE_LVL3; + + if (cfg->flags & UBWC_FLAG_DISABLE_SWIZZLE_LVL2) + ubwc_swizzle &= ~UBWC_SWIZZLE_ENABLE_LVL2; + + if (cfg->flags & UBWC_FLAG_DISABLE_SWIZZLE_LVL3) + ubwc_swizzle &= ~UBWC_SWIZZLE_ENABLE_LVL3; - return cfg->ubwc_swizzle; + return ubwc_swizzle; } static inline u32 qcom_ubwc_version_tag(const struct qcom_ubwc_cfg_data *cfg) -- 2.47.3