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 570D3103E2EB for ; Thu, 12 Mar 2026 13:30:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5BCB810EA31; Thu, 12 Mar 2026 13:30:02 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="DaggJIDs"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="TCx9HVlD"; 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 5952810EA28 for ; Thu, 12 Mar 2026 13:29:55 +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 62C9Spv01756007 for ; Thu, 12 Mar 2026 13:29:54 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=DaggJIDsVY5RU+X+ YNy7fh0t4BrlIakQoZhXZdtsbNqgsjL4XN4cYLSNflG1O2YvZ9xmq2/WgmTkN+kH I7i0sizRJsaH3Ro3EYRpTA5zoXgs+MhVby3UJQcalXWREZcr/erpwfDH5aDOHadn I05kyZGOpCf3JeMatlG4rWlqt6ycIX6m2I9iXSYpkqFjZXWn+l2uJl1lUg5pb6zh Bf5swOsoTPRQiN9ntvmzLvEs4qsijF8mbnqI1H3fDgOxA/EZT+UAg8itJrl44CQZ Lq9ihf+FiQF1iZwujBWDcOBQVvkVOA7VWwSkqBdxsY9URMChi1xSq95RuUxsWg1B GD8wMQ== 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 4cuh53j6u1-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 12 Mar 2026 13:29:54 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-8cd85e08fddso1027578685a.1 for ; Thu, 12 Mar 2026 06:29:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773322194; x=1773926994; 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=jqyKT4W/cNuaTzUqSFqRUV1yQx0wbYgJqqv8//555T4=; b=TCx9HVlDdkRcuQboo819u6Wq9HPRlfDSrcqrrqEeFO9n/ctBkzUvPEDK+bALJu2/4s B+TIkc5Z1eCkMF7roonnFy3tCDMLWGkd32mjIu4fPz43Tq2MOCC4/K+pPXG+DTLhN78H gmpuZP7+EhKKh3RhuZi0OLIS5+433zH8Ei1BMow4049z4/jompZvunFnnkl1dA/uhiUc qsnfejDXgKikhHXsGd/6VKEXxlNZyN5XYk00/b0IwXEnt9rKS+17oXK3m+z8KrgsyuhM WLiirSSEorZ4t8xovpcwRNUCqAEb0pn9rpbKCN5i7F6YuVWSRfxAMgz3HTBUbXj0BTsO dFEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773322194; x=1773926994; 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=achQZXpHEww3KSEXyFAecUtrATU7SLYMH6ZBi7jYLbsL2X8saBNM3jW0on3fQc8E/1 gBF8Dmf3YJguQi00bUcqpo1vUFAClWGYOnn2vhw7LaVXRZNF2cJ4kpLu/djmrFXzdY6h IcJ/TpeDB3eULwwV9UZbTcURlgPlSsSvcpUfnzz1ZEf6NUW/quEG1jFmrLd88I9WnSWW nlvW43YoTZDJQCIzBillNP0VNf5NLFfhTes7HsU2PWl/qo9udYuHXYV46GYuZ0jPspah 0A/3O3+8cBF/aceAowo+8NfeBtz/8MrHHHDlgV7rqOfqAGMCNHr3qXv0ZCGMDPfcsj7G f66w== X-Forwarded-Encrypted: i=1; AJvYcCVvFbgEDdoVSzUrctgirblacWnh/SwcGKbPRAhTxcscHhc7wds/UPh0sPhoSQWn2Cgd6TfT41X6m64=@lists.freedesktop.org X-Gm-Message-State: AOJu0YzXMeat+ieOlNx/PqHFb29jMN3YV7LtuNtZvLdzFZK7ZVCVBSO3 Pz3sxJYnvbxCs1rBP1PmWCDKxxLbuPpIV5nOf+uPSZFBNBS3oVnFW7XGe72X2OOa2BHr+g00Vp5 gT8Yw+T5YC99NV3mHRHpN592O4vpmuT9DMPQWHtuvszdPeiEo+c8WmRuMtQ3kFREDO43TCOk= X-Gm-Gg: ATEYQzxCEb2FWPPbaV928qxo8x3a1e9MZXPGwls/CU4k+pRTzt4PgVc5juiH8cp6S3p bp5riDgtg9EYQwxqTlCWNKPgEq9cyK0ZthGVYoX18humviNj7qGBCm0ZNQS3HriSnCITk5nYAIe bwFvpiaIko1tb+Pi28zhU/aeE8FezHTSGLZhyh6laZDO0cjjFvFV5mLXE8EdpPcfvqVtsjDfgdY BCMRlHUnDSQj6yS6HQgDQkZg+NfomyjYFd6Zf+Tlp+j/5ihj3WPAJBck7X4Tqqp4mTfXppE0wml SmrWbJRKUOUpWpPUoRuAYrwj1APfzHRHEqrvDfQKSKuDKQ16nSB6uVUIXvDIyI+rEVvprlooj5y Lrks4m+U4Gq4/+WW+hND0c7ioxLSBS4u2VFi+6W+khBouuVOFbJGX62SbyjekIWPzXCl33bRgao s6Hx+wvy6T4enoB/z4vQ3n8lPfsY62hVkexXA= X-Received: by 2002:a05:620a:d83:b0:8cd:9446:cef9 with SMTP id af79cd13be357-8cda1a562a3mr778065785a.60.1773322193782; Thu, 12 Mar 2026 06:29:53 -0700 (PDT) X-Received: by 2002:a05:620a:d83:b0:8cd:9446:cef9 with SMTP id af79cd13be357-8cda1a562a3mr778062385a.60.1773322193329; Thu, 12 Mar 2026 06:29: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-38a67d617e1sm8646671fa.9.2026.03.12.06.29.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 06:29:52 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 12 Mar 2026 15:29:34 +0200 Subject: [PATCH v3 13/27] drm/msm/adreno: use new helper to set ubwc_swizzle MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260312-ubwc-rework-v3-13-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=2707; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=Dp+N+Bk8UMYAX+OsWFRzXnJ6xbH9DAMBa3dOlN5rF0s=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsr+2JtEAtBmQ/NcrldvywY10gImttE0oGu/aC LPb10BpE7aJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabK/tgAKCRCLPIo+Aiko 1QL0B/46X+E2kxsvXxWD3d7+sr2ywH20dgQme/s+FJAEU3/0Q+AmAS1DhEZTNwdxMa2StPQKvLY WB4sO4ENNQg/OzFo60K+PifFsL1nLEIBCD3BW/CCyg85AVRm3ds2vsUXHrYPDxZ11r4lB75wIBI 6m1OJB0qZ3tD6svcNlKYGbeWAzc6fcOkD/9a7cGO/0Gza3SJT/ZI2MgJSRkjvvwfYOjJUi0xEVy 22ffARkP3Xz8IDEZ1yrQyZLJCk1jjobRMxZbRRSScvcp22LSb8rtxgKO7Vg8gacxwPiA8vRbDR/ PEmVcvQvcYIlI3qJsEBTMJKOlBZv+baZB94HMtaL/2yR7lzs X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=ZN/aWH7b c=1 sm=1 tr=0 ts=69b2bfd2 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=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=0JjmiBfSQHijSEXDZO0A:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzEyMDEwNyBTYWx0ZWRfXwY6GUEu4djr1 SYZANxdgyTrcdUgYVL2WejstZxQvlvkHLv9HJrFrJ6uANXB57rKeKME090JkCJ1ajtOqmqngegV T13mR12T/kISTY50BGH3/I5u04RdWDpYjGAVgkhP/yP9F2lwW8hHdH8Roqbq9TDLIIUKY4DWCsD Y4go+EMY+GNFYbx5dgF2DiQfO6F9DXPkpZDyipubvHPvIBn2ZXqNjGTKzVeN00xzs6xWwqo10rp uu6J3tbBnkC6blMktbAEUwfDgl0K+N7RusJe9J6LcAWY9qvQJlScjrPpF44hhwZ3skt2GdntLc1 B9B0VR0cYGdIKQ+k5Ile2ncL+JtH4VnAF09DjzPeFy4rSmI/rYwQw+hvHb+5Rc+dS7i7hKa6uJm 2DbOOvkPTILX/M8A/g0OLE1d4ovDMXWuFj4B/DfrVYZ2/xIqwq2/LmKQw1b/ZOoiQdYyceEQI08 9SaEgUw7lvlXFG0kEsg== X-Proofpoint-GUID: CGdVD9ZBqzFcuaqs7tDbVCpCXI9oqcZN X-Proofpoint-ORIG-GUID: CGdVD9ZBqzFcuaqs7tDbVCpCXI9oqcZN 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 lowpriorityscore=0 impostorscore=0 phishscore=0 adultscore=0 malwarescore=0 bulkscore=0 suspectscore=0 clxscore=1015 priorityscore=1501 spamscore=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" 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/adreno/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 = cfg->highest_bank_bit - 13; bool rgb565_predicator = cfg->ubwc_enc_version >= UBWC_4_0; - u32 level2_swizzling_dis = !(cfg->ubwc_swizzle & UBWC_SWIZZLE_ENABLE_LVL2); + u32 level2_swizzling_dis = !(qcom_ubwc_swizzle(cfg) & UBWC_SWIZZLE_ENABLE_LVL2); bool ubwc_mode = qcom_ubwc_get_ubwc_mode(cfg); bool amsbc = cfg->ubwc_enc_version >= UBWC_3_0; bool min_acc_len_64b; diff --git a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c b/drivers/gpu/drm/msm/adreno/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 = to_adreno_gpu(gpu); const struct qcom_ubwc_cfg_data *cfg = adreno_gpu->ubwc_config; - u32 level2_swizzling_dis = !(cfg->ubwc_swizzle & UBWC_SWIZZLE_ENABLE_LVL2); - u32 level3_swizzling_dis = !(cfg->ubwc_swizzle & UBWC_SWIZZLE_ENABLE_LVL3); + u32 level2_swizzling_dis = !(qcom_ubwc_swizzle(cfg) & UBWC_SWIZZLE_ENABLE_LVL2); + u32 level3_swizzling_dis = !(qcom_ubwc_swizzle(cfg) & UBWC_SWIZZLE_ENABLE_LVL3); bool rgba8888_lossless = false, fp16compoptdis = false; bool yuvnotcomptofc = false, min_acc_len_64b = false; bool rgb565_predicator = false, amsbc = 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_context *ctx, *value = adreno_gpu->has_ray_tracing; return 0; case MSM_PARAM_UBWC_SWIZZLE: - *value = adreno_gpu->ubwc_config->ubwc_swizzle; + *value = qcom_ubwc_swizzle(adreno_gpu->ubwc_config); return 0; case MSM_PARAM_MACROTILE_MODE: *value = qcom_ubwc_macrotile_mode(adreno_gpu->ubwc_config); -- 2.47.3