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 22DF1105A59E for ; Thu, 12 Mar 2026 13:30:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5C79510EA37; Thu, 12 Mar 2026 13:30:19 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="Z1UfmdRG"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="bpm++CyR"; dkim-atps=neutral Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by gabe.freedesktop.org (Postfix) with ESMTPS id 53A3810E9F3 for ; Thu, 12 Mar 2026 13:30:17 +0000 (UTC) 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 62C9Ois73136622 for ; Thu, 12 Mar 2026 13:30:17 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= CHHWto9L3DJt77vFN3vZgjFHf3Lp2HIBccOsbhUwjkI=; b=Z1UfmdRGMMzqhXva WUVlTeJAXrF3kAkD8zQhGqymLE+LDJBwC2c4K5LmpCOzkF8z7ZMxmWyKJCqLZ4ON q4tQ7vNAHWhoasIdaDjtAFSIasYSuGh4EAKF2KYTJ9RYlVW5zkHoPwspwOcVB4+4 Iml6agVygHUUfpQn18LSboFlsFkJrq62pHIs0F78HzC7TFzyKjNo5RkVNZfOpqrH wxLld6VM2hrYCBlmLBEZnUUMvnq8ml36fWQ0Wex0VckX0ps9lwvDm1OGKtmDS6s4 Bny85nULhMFTkhUIKcDPGVLjkqqS5eqOwvG+jE0KaVNalz8zrzPpqgRIJGSVhnZ8 cb54Zw== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cuh4wa7ha-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 12 Mar 2026 13:30:16 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-8cd83cfb36cso724629185a.3 for ; Thu, 12 Mar 2026 06:30:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773322216; x=1773927016; 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=CHHWto9L3DJt77vFN3vZgjFHf3Lp2HIBccOsbhUwjkI=; b=bpm++CyRBDxjRpoLaviGjvcnEiyft47lPjRwD2L7FUO2tilX5ceAy8/xckAfqjlx+F j9vNarpctXn7ip/pFlL8GlsBwfwAt3j47Yrb6UXFKKMs97BWhnxdx9oLPLtqWWBLMwwf OEgkrLrnf5T9EBfKo/lCriNuIXNuWby9nmtyb10b4UV+oss1bN8d5OKyRS+h6vnW6+xg FxMh9Hn8B7q7Tv69t6A5gVRis6FXf8BXr68zC1wEDEFbd8KFq52ruWrMtSX2KE5mW1P2 XGaYqiXu6clH0lxeFBMuBoqQXIbueOQDPXvE82XYN+Pa1fgsO4hwPu+E2NTK7uv4gzJu wNsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773322216; x=1773927016; 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=CHHWto9L3DJt77vFN3vZgjFHf3Lp2HIBccOsbhUwjkI=; b=A7Cjgnca4NMG/Ew6hawFeLduP4aKglZSiva+q1itrTBsgm9qMhhPBX3TFYFTpvEs/m Oi1o06WuHQN4f4b7nLRXwsi1re1zWOmnwN3Wlhpcr5xkR7cnoi+PEVo2qoO0n8UnjTS0 jrNUPPpxjlODFtX1otu74uNMBbm8i9GAwlxNLFpxZv6U//oz0e/v8GZ6GhRCCcYDfUxT /8RFmo4Wr9MZK77X84J0abG0zRPi3ZVJsabRQ/eMqPGsKEFiPb7+jjpa+uyhX0d+Kh9u 51d+26RI9ZVP3YSwwniaaX/Aa2NX7ms7F8OEphtvCovr64xnPGS3XMiFDko9IY6JjvEa h0rQ== X-Forwarded-Encrypted: i=1; AJvYcCUMUizjmr/jVjltBz2bDnpvCGqZ0Jtx4Opd0dF888vTZL1SJHG4hvLwoFcfuPVoaOCxdUiGLtFSaEQ=@lists.freedesktop.org X-Gm-Message-State: AOJu0Yxqp4krcad3rX3rnFp8WM0jViGvMF8HiuTlrTeuW7KgCyXf8lyj bngJsK+nuq/z+mZ02A7PDSoB3clFy2/ZT1dEpByxY4SDidg3RPj87THDVreDjDKIZ5k4uZzctYB srV7cIG0hHjxLnky9NdzcS53NQUWUPVA5Ie2FcQPeCmj3Xt782UHSDituv/OQ8jqS48ON3S8= X-Gm-Gg: ATEYQzwnzllso9uk7pCBsbRNAOCW+inU3l0SrYZgy1ylqKrADpnQ9I0QqNUCzPzqDE0 QMPPJBLvEKgPF7A23ZDLozYO9hnggPGd5WpL2HiWfkReKe2MNpdDb2j+rOVl3WWr2QdEiivxaAp PPP0BwJX4lq+E4f2D6ZQaNANlt5/Sz4ZdeKn1zKGXzupKyQ9AaQ2wkTzEInOc5tzmVOMhVHpCVf 6fX3oHco3De8EjAISowmOeg8CMuES677pZYKGBoYt3dvPR8NDf0G7Klyefylu8lA6fgUYKXNVaG +bk3TTcrKczmaMjxtWK8WR22oTcWEv/Xta4VNeLvQMq/U8W8AuYtLsPNND2qu8oNMeELCpez3GR G8h5WQDyJjuqhStFhRZC6I02YFTDMR1NiaPQFOUDz1aB+cqM4bltDr2yPkFfoZIRwaZlsxiv5jH NYZqklg2TVaxCgJnQlsuiO1w7ExsIjHPJmjDM= X-Received: by 2002:a05:620a:40d0:b0:8cd:8785:eff4 with SMTP id af79cd13be357-8cda1930373mr778952585a.15.1773322215679; Thu, 12 Mar 2026 06:30:15 -0700 (PDT) X-Received: by 2002:a05:620a:40d0:b0:8cd:8785:eff4 with SMTP id af79cd13be357-8cda1930373mr778943785a.15.1773322214962; Thu, 12 Mar 2026 06:30:14 -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-38a67d617e1sm8646671fa.9.2026.03.12.06.30.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 06:30:13 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 12 Mar 2026 15:29:47 +0200 Subject: [PATCH v3 26/27] 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: <20260312-ubwc-rework-v3-26-b7e8f800176a@oss.qualcomm.com> References: <20260312-ubwc-rework-v3-0-b7e8f800176a@oss.qualcomm.com> In-Reply-To: <20260312-ubwc-rework-v3-0-b7e8f800176a@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=4170; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=aZePfCHlihjZhkopGUN2RVAJWZ7XbjQf2cNHz8Ha1/A=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsr+4QsRN/zWuciV6Odv4RrrOuSOvS94vKiH4B itDI/Uu0EqJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabK/uAAKCRCLPIo+Aiko 1VgRB/0W6lSJU7HgKg4riZddJ3HxFtJne7/DCfuauUegKe3lB2NlBQxcWy17xZMdkYFiBGeUVHD fXJVf8VKdPU2yzJJGs3eL3fUepzF+fxvvuCI23nYJCpXhUOj2SqWba9OvmAfFIimqqoA5FQZYbc 04s6Ph7rrcaHo3mKhawoSbbhdw9U5M4+3XzfdgMX8hXOH0ljaoO5na2i8s3vNek+ln9DuQdaf3X SRSWE1AD4Qvt1GCV7SroHBYT9mR86wxHAKG2ZYfPgbNifAga3wmYph9r2pQvmLKTvShntY0euk1 046NHQ9lmD6BC90Iwwa72lJEqZMvkgfUkQD8xJ5iGsrC0owG X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: dcTXdMlIzDWOOUtd9EaNqGpeOOsTQTny X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzEyMDEwNyBTYWx0ZWRfX7A5mjQZ3FFIk fM8ESWAU5Cl1cs6E0e4CZPShiCQdYeIvGwa8HRjQ/y3bdycbJJbA46W5b86YiLvZoNvdfQ2m2gO inwlPoyGFKOnvNzbJAS1ZUTz2B2RvbpyX8rBmdcGdivcm6y7KMeas3xhlvS2M5vqnpX1BGvKgWe wuoMBXN7458j528yUSgILftb9hgMS+M/xHuF/vLbxV3i51LU7Ta9FNpE7hxMHjhmnyL1KNZdgvD Y/RODR1nv0UGg/Oxk8h0KOEVE0ZVnrzpwDKg3aBi5NSwjPUH1RIvLDvPZ9b5v+rR5hbogjwrfBx /m5hqiBLaE3h/5U9fmpW9/e7VIzgfHo6HQd+1BtugUEyvCmycAkUT55B3Xrb6Af44aJ8RlazGLE +j/2TgSg/4ketug86CkrTHempbj29mUQSPmH+NnxB3xdTbOGW3Os6foESTXKwm8nrY/cCUvd20j 8I8ZuXpnVTUqIHV2JwQ== X-Authority-Analysis: v=2.4 cv=YucChoYX c=1 sm=1 tr=0 ts=69b2bfe8 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==: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=3htL6sknLGLhwEng4zIA:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-GUID: dcTXdMlIzDWOOUtd9EaNqGpeOOsTQTny 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-12_01,2026-03-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 impostorscore=0 phishscore=0 clxscore=1015 priorityscore=1501 adultscore=0 lowpriorityscore=0 bulkscore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603120107 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. 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 = { 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 7c9506741001..a7372d9c25fb 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 @@ -98,11 +93,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