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 01C97FCB622 for ; Fri, 6 Mar 2026 16:47:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3FEF110EDED; Fri, 6 Mar 2026 16:47:37 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="cW81b1BY"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="WOXiGwon"; 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 D1B1C10EDEE for ; Fri, 6 Mar 2026 16:47:35 +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 626FrENx2008825 for ; Fri, 6 Mar 2026 16:47:35 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=cW81b1BYiUy2ELXh BzCE03Hei4NK6Qkx+HQeA9DKgLOTIUxtVkBxK7kZfJta+IAfpVXG8JGltlc2wtrr LRdLoM0Xqq5Xl+89uqD3tOQuB1usfHWpVkfb6Npam0mkeJhkD2mJRmvoQab5jn0X VHlf0mYp62MCWcynvhLtQ/iYv8AHaeaaYBDBzIXWhvxS/DMj6YTtvCA4HsGuy8VH 9ENQIckaf1N5O0169V+6olSGSlT0DiJOIYLmwjqGmlSk4PvJWh7YgAj+jQ3ioQX0 XYeBkrhQ69FNtay535XQNpTqOU+gLBHwt8DnhEa02eRkZAb79/7mRzyfTzdT50MQ GD0GSQ== 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 4cqv9ahck9-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 06 Mar 2026 16:47:34 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-8cb706313beso1228060485a.3 for ; Fri, 06 Mar 2026 08:47:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1772815653; x=1773420453; 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=WOXiGwonuQA2gaOT4r4lTnZ8WSCz1Ou7Y5W7Z58/7KxentZ5bVyQkd8+ZS2eHvYDHn KqexIVsOyLi4rMu9Fdb7hb6Ob0Iju+aC4JsGMukUQS8UPI75lcmZ2++YbttUKGj2FBQ5 2AiGYpS0h9DFvx5HZCDKCAto7M6bGId1DAtrp9aLi54Bwj0VyfXDeR9GoCi2qyeDnVWu /Ff4tYI90V4Pr/hwKZITn8VzJILQyuwtxs66qY+VEVibXIgJxCWQvlLCgYBbaRHH34lh itV5DKsqCmh7mB4DGP9DGF6tAa8RJKjjZzba/dOKPhpUE6RD50H9NqRp17wGZ9NoiImS v4Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772815653; x=1773420453; 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=K/MGN5FPrvU0LHMEP31dmVWFg3Xn01ZmPqKDV8v9dvJtxKS+koLUwrr4qNtH6zKRuO uGXua5Tv195FBr0/50XPyc+lp5A9WKu5OfjBhYGEr01b7mxaWFGzUzMjMG54OZh1ahg3 NGMi2H+Agnamb9CjCLBYMzV5VgOAHa3D2NWvrB4FQX+l/hOO0LELtlU65ywnPr7+b1WH vGe2FUyowxVoZd4JDFj1xj2xV2T45v7wMiznXHutTY6mtzOQvFr1/91fX0LM60F9eKO7 9vxuISPKsVCeujaf7fnoN24zVBkDritQe+3tWqN9M1Y2KMggl/T/4pRW3wYf6ljpGavl lXlQ== X-Forwarded-Encrypted: i=1; AJvYcCV6SsJzUKtSkyvs9MjI5yW8e54FY+OGviOkEH3KsjydbArwB/LZP9bm90k+XbemQYRx/sjfrCwntH0=@lists.freedesktop.org X-Gm-Message-State: AOJu0YwQkZIEzT1hizKf0VC00GrlA0kg/8NbASqGOk/Et525aa+xT/7i l7LRFGcdEjINTOfrsczvzxZOFfDRbGSvGE7LRdngTEwq8NouIUlMC84F5x6LVXiPA1uHzuSXGAo Qkk0NVkKi/sSK7tUP6tc22sj+ehtfKCe1Eo0kIGH7sfSxANoylg5z6WVn7VdQKq3HKyIBLzVCpC MiggY= X-Gm-Gg: ATEYQzwWtegx6xvSmMrYwhcmcY8i5/JWsq1XFVJHB3WLSEJiVqcz5f3GF1Mw2xe9Bo7 Wvrg6mz8X8mUsX95hJnUBnX9FXo4G0n7nexiXOUJhRCy1rDs0qjYvtxExcs+PZppxQ/kQ6q6LI+ BYmnOuIvnwQzGEcX2IPu6v2DpeQqF+QjIR2S3JR2yWJW1Bz76P+gmANI3ysahCMoDBDnJzWmlTb O9U+yzuAYiPYyYHQ5NHpi6I+/dZjyD5JWK3S1tTirNZAQL3a0Lm+E+GpsWLWHkHLT7Fkrh58d7b Y/4vspGOtzPCvXZ3fax/VFSrj3Ijcd9H5fNMOne47v/vCVZ0sFQ0oOE1hQX79z+zONLOYErctVM PHZ9LVEFdavQxtE4oUpX7jomv3ymBwMPnmenTItjWf5E2dFsBnfJbxfKa+uhw8g07DiWjs3Vk/s YsxyIs+mkyR4PzvS9CsSA8ip1RexSJIBf/Ut4= X-Received: by 2002:a05:620a:4607:b0:8b1:1585:225d with SMTP id af79cd13be357-8cd6d4a6d76mr316672385a.82.1772815653073; Fri, 06 Mar 2026 08:47:33 -0800 (PST) X-Received: by 2002:a05:620a:4607:b0:8b1:1585:225d with SMTP id af79cd13be357-8cd6d4a6d76mr316667885a.82.1772815652532; Fri, 06 Mar 2026 08:47:32 -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.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2026 08:47:31 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 06 Mar 2026 18:47:17 +0200 Subject: [PATCH 11/24] 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: <20260306-ubwc-rework-v1-11-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, 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/pANAwAKAYs8ij4CKSjVAcsmYgBpqwUO+cW8IttvRxZ7kZaN6gVeCBanRcrfHvEmx kmoALrut5GJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaasFDgAKCRCLPIo+Aiko 1YJ4B/9qW5rJ1SwBReASY5/KyLYyVFXtnjWwxBXVf4i7cC5e28xYc9gm8NT7GoRPB20/E0y2ou6 0GNyzRYWdMTmAECPm6+7kmuGlYLCc5pGOZCdyhIFOKESeIfanckIhENp8b+6Tq/yZivgUKeVs40 XTV7DyLtlZ7TRwDGcnSwwwtQtF1hBVIF6+mxyJdVnpor3bs6u7FY949gj6rzXaKozsCRfcbaPWf n6uccbmnA3zHYVmh0W/CDobRy2tS7xp8HGf4NdA4ewB8t7dM6q/tkP3cSuqulcoU5fSRIszdYaJ HctLR77k44CBc/zt3DPSj6H+8Oz22e73q0GvlOKyDpLXo1WK X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: AeylB9tvHKZMPIbHzm327446xg96Y3Qu X-Proofpoint-ORIG-GUID: AeylB9tvHKZMPIbHzm327446xg96Y3Qu X-Authority-Analysis: v=2.4 cv=G4wR0tk5 c=1 sm=1 tr=0 ts=69ab0526 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=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=0JjmiBfSQHijSEXDZO0A:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA2MDE1OSBTYWx0ZWRfXxmJ0A5vZCHyT aFqHVh+mBtRZpFAfTU2DDH4v2fiqMs8yr1YZkXTSahqzasXLYvlwoEe61FptDg7kuYRM+flo5sO cO5j7ryUzvwPF1je5Prc5l9y5De0z2Q+fGVOji1OhP32QAg0Sr83HAvTMvwkFEziiRQeFjAIA4B fmb10OqCGdoMxlEckuqb+FwKdLKxLkdonDuHOo8igji0yJq+atDEIO5mXSY3k1msQ14c55J8xLO x3uqAEfuQYXkZ9pXpGmgf/tNq3fme8aTQlw+vOUpHPTnjfMWoLWGFuUsqc3kwA3L4w2li/TXzYg zRyqLcOsIh6IDw23vewxszEYMglGUZ/a9H18lBHALWe/k1WpyAOK5SZ/xc9PMtNGfkBTY+t0/rf Qk/SPqRg7nK2SfgWMFt2Woz+4m+V6UG2tOvhAmAJjf6jLMJc1NggU121eSqn11/wnH7vwTINxPw Lez7iT8kP82gEQSSCvw== 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 priorityscore=1501 clxscore=1015 phishscore=0 bulkscore=0 impostorscore=0 adultscore=0 malwarescore=0 lowpriorityscore=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-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" 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