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 0985DFD88EC for ; Wed, 11 Mar 2026 03:24:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5661A10E7F0; Wed, 11 Mar 2026 03:24:16 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="EPaKyUHK"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="apIk7+tT"; 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 49C3110E7EF for ; Wed, 11 Mar 2026 03:24:15 +0000 (UTC) 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 62B3AMJm2180799 for ; Wed, 11 Mar 2026 03:24:14 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-vs1-f72.google.com (mail-vs1-f72.google.com [209.85.217.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctqvsspeb-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-vs1-f72.google.com with SMTP id ada2fe7eead31-5ffaa511969so7625070137.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=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=qJ6Ex/AAn1uIE82cXCit/bkBSE8pPV30Id+vTgVPV2k=; b=apIk7+tTsfzLvzwcBg0Gz/5PXB8JcVeTUy2ClutnLg+kPZDwxdGhBwF5lUcy7+H65+ sXcoZsKBgeQ4TeM5ZaNiGgEA+sMaT53GkSPHypazeogJ7ET4dBUh08la+D+UhfEvPs5A DV5Fwcvt/4ZGDPaT2ADhYfOzb7Aa7hdtQ5a42qPg7owxF070UyutkRh98OxqbMxL4F8s DuxNM3DOikwerrHJYg/H9vliU8VkED/h0lTEj1TbaNX5cAzreCXe1NSgU+3ivnkXx8nz KwuSNx5v9EeZ/TvVPFa9Bd/mJ4NUq9hJk/iKE7YsvLEsfCdYVleF8Q417mpVUUVf/QIh BG5A== 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=LCW/wAv+CF8+KmKUiO+K4mAQoqM4tn1e1Sklt1IBaMTSDkg5rcDQ0AEsW3GIbNKXlH CXDcOjEdPIjO6r9EX0rMlbSJkAv8WAaAZRF9jvzIdJEY4bvPeJDjdKkWkWdgd+2Lk//N rggppOKE+nfUA/GshQxDhF2sQtUgMtBIu/MPBlk4K3kNuHjmolwTIP/YIUVQSm1pJGwg PlRC5TpJD4A9Flu9pGBiejxUqbLDxX36aZEN3vOf+yFR/eJNVSucNpU2UkMhRlMfst/x oW/jvmYeHdUdgwFV3imxG5l1HQidLoXO54/HapJDF7Wsmh+huZDlIx/o3oM/capzExlF Ycqw== X-Forwarded-Encrypted: i=1; AJvYcCUUPQxZHiWXAa3a5nzgWaN63firNjzgfmHrPGDCU14pbstC6eLzSlBAr0etGXOBdbFz8U+PnhjLyzg=@lists.freedesktop.org X-Gm-Message-State: AOJu0YzzBX5k8HU71yZvB30wVT1dKHhh+iPg0Huh5OAsryrnPvBfzi3U 7mPtSRhIoRbrVxVeD6fwTU2AarAHp7lRouiLGKfszfr1ZijFGloZWiY5BpoOJWCDfOoHfVBKmy2 NqSD9A28aIsAVq2tSCtM+sFrCgrCCZedbojmmoy5KQ3VF6S9c4PO6e3Pr1apGGlK/rsNifCQ= X-Gm-Gg: ATEYQzy9J5cWSC/9jz6Cfoflile8pxb7IGnwi65ckS9j7H+Gfqphz/s99bu4qVfd04K iGMdHvyCiPtAIYHqSu/P9nZoE8/3rCqgsec15YtR/WXxibfstDxIS5JQsxUIFKIc9OD+TG7htak Q187woXlPfizbLiStq2kmyCXTjX+wB9/v2e19BRfqoPTenhq25TylgBZfoAJNo56Mi4yCEFNvKK u9ZF8hd3O6P3V8WPDeklUU18cZcVsYR5ZNGC+V7RkAg0rYpKnIcSSXDe3clnoU9iAKsB6nlypR1 s2GwSXbMDC3x8kGiS7nmvjc+40MzjImKnIcEBDirrmcGccbUKbkqNEN6VRH3nKcvsUqTgnc92Q6 yoJC6lD5NWz6HYhEGjtatkOKBVM4gFDvJkgL3C1zGKplVFsl+0web61JOvQRyRxhzlHedM9lE9/ ly4PFk5V/MCc8c3h6jRckgpdc++EjX7Ce1+4Y= X-Received: by 2002:a05:6102:3ec5:b0:5ff:be25:8937 with SMTP id ada2fe7eead31-601def8ba4emr391979137.31.1773199453593; 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 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfX0gS2iY+2K8QE 7VdfzVjkEizwTVVymGAY9o+ApfnYYBLM67MMxC5ZHanYySh+qbHbILJ5ehTwbwPNIO2s7Oo+Q2H A5OpjS+VnoGWDLHQL7AgwHgqG0RXM7tWcTFWKeW10991jCt2k6FxE7Q9HcPmrRCWn1JiCyXXGU0 V1cjgvhRcDRtVGOodzIe8/64iTL+m4na9lHRd4V7RWtWljhDcR9H5wptBzt/TMNNFnlGYfDFLWO y2lTHbZdpOS7QiL/BknOiBX1QYzmQQCAZz3PRMXOMxuXd/TiseZVwBMPpETunWNOqCe4jUHWU2F ksI4BPPiC4+uZtVj9IzAOVCF2hs6zr4ZJKXk4vfsTLTVmhATbmCpHvke6B4F/LniZOeZJOvtygX 4IRNY7aHXAW1zgELsN+RzaEmIGCzxqTsyR9HAZn3b9jmsNmL7WTr4lRg5LYVqksXM7XgCnXgEYi 4MaKA0yWPIQzyJtiLyw== X-Proofpoint-ORIG-GUID: A80_RpVK-OIrEPC9Eips0BYE0F8iejcN X-Authority-Analysis: v=2.4 cv=Lo2fC3dc c=1 sm=1 tr=0 ts=69b0e05e 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=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=lOjMx_-Oxa8n0LcNG1gA:9 a=QEXdDO2ut3YA:10 a=-aSRE8QhW-JAV6biHavz:22 X-Proofpoint-GUID: A80_RpVK-OIrEPC9Eips0BYE0F8iejcN 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 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" 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 = { .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit = 16, - .macrotile_mode = true, }; static const struct qcom_ubwc_cfg_data msm8937_data = { @@ -49,15 +48,13 @@ static const struct qcom_ubwc_cfg_data sa8775p_data = { .ubwc_enc_version = UBWC_4_0, .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit = 13, - .macrotile_mode = true, }; static const struct qcom_ubwc_cfg_data sar2130p_data = { - .ubwc_enc_version = UBWC_3_0, /* 4.0.2 in hw */ + .ubwc_enc_version = UBWC_3_1, .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit = 13, - .macrotile_mode = true, }; static const struct qcom_ubwc_cfg_data sc7180_data = { @@ -68,11 +65,10 @@ static const struct qcom_ubwc_cfg_data sc7180_data = { }; static const struct qcom_ubwc_cfg_data sc7280_data = { - .ubwc_enc_version = UBWC_3_0, + .ubwc_enc_version = UBWC_3_1, .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit = 14, - .macrotile_mode = true, }; static const struct qcom_ubwc_cfg_data sc8180x_data = { @@ -80,7 +76,6 @@ static const struct qcom_ubwc_cfg_data sc8180x_data = { .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit = 16, - .macrotile_mode = true, }; static const struct qcom_ubwc_cfg_data sc8280xp_data = { @@ -88,7 +83,6 @@ static const struct qcom_ubwc_cfg_data sc8280xp_data = { .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit = 16, - .macrotile_mode = true, }; static const struct qcom_ubwc_cfg_data sdm670_data = { @@ -155,7 +149,6 @@ static const struct qcom_ubwc_cfg_data sm8250_data = { UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit = 15 for LP_DDR4 */ .highest_bank_bit = 16, - .macrotile_mode = true, }; static const struct qcom_ubwc_cfg_data sm8350_data = { @@ -164,7 +157,6 @@ static const struct qcom_ubwc_cfg_data sm8350_data = { UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit = 15 for LP_DDR4 */ .highest_bank_bit = 16, - .macrotile_mode = true, }; static const struct qcom_ubwc_cfg_data sm8550_data = { @@ -173,7 +165,6 @@ static const struct qcom_ubwc_cfg_data sm8550_data = { UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit = 15 for LP_DDR4 */ .highest_bank_bit = 16, - .macrotile_mode = true, }; static const struct qcom_ubwc_cfg_data sm8750_data = { @@ -181,7 +172,6 @@ static const struct qcom_ubwc_cfg_data sm8750_data = { .ubwc_swizzle = 6, /* TODO: highest_bank_bit = 15 for LP_DDR4 */ .highest_bank_bit = 16, - .macrotile_mode = true, }; static const struct qcom_ubwc_cfg_data glymur_data = { @@ -189,7 +179,6 @@ static const struct qcom_ubwc_cfg_data glymur_data = { .ubwc_swizzle = 0, /* TODO: highest_bank_bit = 15 for LP_DDR4 */ .highest_bank_bit = 16, - .macrotile_mode = true, }; static const struct of_device_id qcom_ubwc_configs[] __maybe_unused = { 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; }; #define UBWC_1_0 0x10000000 @@ -80,9 +71,16 @@ static inline bool qcom_ubwc_min_acc_length_64b(const struct qcom_ubwc_cfg_data return cfg->ubwc_enc_version == UBWC_1_0; } +/* + * @qcom_ubwc_macrotile_mode: whether to use 4-channel or 8-channel macrotiling + * + * 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_data *cfg) { - return cfg->macrotile_mode; + return cfg->ubwc_enc_version >= UBWC_3_1; } static inline bool qcom_ubwc_bank_spread(const struct qcom_ubwc_cfg_data *cfg) -- 2.47.3