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 A41B2FD88EB for ; Wed, 11 Mar 2026 03:23:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 01D2A10E7C5; Wed, 11 Mar 2026 03:23:53 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="apZPe43U"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="gYgOE6hT"; 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 719A710E7DC for ; Wed, 11 Mar 2026 03:23:50 +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 62AHbbGE248937 for ; Wed, 11 Mar 2026 03:23:49 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=apZPe43U8Pl8U+mL ydHIqqJCFMN8yvkO/KJ6xKxDyqHqu2tSIqLZWzg4u337h/0mZIu9Ln0/7X0csQJy 6c7cCPUVd5lGX8pNCGwe0SccSjGFIHMUa2eGeXkv7SQLRlgKo8PgyGMgi+Zluvz3 rO/1Xj8umhM5QPFkc1AjwtosG2I2NxPu/sIlP4pm6T3YUdwXwt0xLgTlfYyzVytF Qa0C2CiTFb4VWSTv+8dttX/aLmfNqvyJANkTQPTugLP4yEAr7Jotkn4rRBvXZyAC 8INrGUgs2W7KHh7+2Tv3TToZWjUPBuoTYMsMf3P7GegmpFmRc1mV2OCMA7/ZLY3+ 5lJ+qA== Received: from mail-vs1-f69.google.com (mail-vs1-f69.google.com [209.85.217.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctqv11nvw-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:23:49 +0000 (GMT) Received: by mail-vs1-f69.google.com with SMTP id ada2fe7eead31-5f58f90f83aso92730805137.0 for ; Tue, 10 Mar 2026 20:23:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199429; x=1773804229; 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=gYgOE6hTU21MBKiBh1DiqwGjd6b1vpm3rPS2nqviTVeGKkZ1zUJW1lJa8VKJaHMlbi uTLSSeYJMDBY5Z2tn971q0kqk2WUBZzsTdqn/Oe0XhQRhJ9g3AL+vXQ7cxBiIPqRGAtO /0hqk0QtfpGmuEYXBSt038U0yOOs7qlkjSrvIXZhFUM9UjRjHnrzSYtptxoMvd42Kn9w QGYu16tReBqOp8Ym87wMboeZPjvvKIo3O51i0GiYGiuyAcReEDVeL2wbo1UNZBgZvMzw 12npu6jyO6Op/3zIrRPSh+dpwrbOOflqbsbG2QkGyObT3vbSmZxBUlHs42a0bg4eBgWS ksdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199429; x=1773804229; 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=b4YTp6Vtg38T6m0gHQnuzgU6AtnRdrWMV4VibsS8OFmTbnRi0rjxLivlNVGfu5uKH1 +Tf99zuhl7mRNl+PEeG/NYYgcbbMVX0Nn6XaRLlEM50mWqnSK2K4UKVlilAMX6XJ0p1I NWGDjbwsfcQGIw2+izL/3a0cngWgefwVib4cVXEOKJJVPWweNAI95MgIarNgyPNsbZb3 QlEXSFr2VMnXADtqAbti3MIjoHnq0WIOcNXNp6nk2oIN517hu+r7N8S4CjJM1GDHTQpI GEYTwkBtUlmP8e1fn/zEz0BdrsbauSGhFU9GM8teYcrWfQwPZLftiF8Bxi2iZRuZXPqo HBlA== X-Forwarded-Encrypted: i=1; AJvYcCUTGeNeKEK5HM9md+M1yeu1jpQr8M2xMaWccPiHHl1hGiydrK0AgWJwXeduMMcSsiBbpIOnXDrOMOg=@lists.freedesktop.org X-Gm-Message-State: AOJu0YwiZ0Hpqh9Lua4hN7IePOt3O4sMoUnvzf7sDcOpM8ik9/2x/lfL NjjjavQWaiOMmzcIW8LYz7GP5arkHu5jUGHY7Grc/k7O3jt8KNO1mFivLedGh7sdC9Du5th9/x4 7pGpU/lnNjO+jXtK7/WIk5X6NX2ji5UANg5eIzWBLrNgcV6rJhv4b3knj5xnPNPV25eiBSQg= X-Gm-Gg: ATEYQzzohZkjq/sub5EF9JYDnKqOHf8GSIpNBfj0TAkNezivuBYWQrabH0UNP4YC4u/ UaHDuSQNFJyVEGfsQcphwJTU0EHEaZBrG5hDpxQKcBt91I4wrLAyf9mlTDp1Ty5EuPpZw9k9btD bY7D9dauS8njW8Zauc8xOMEuggUjspcN67lnns5Wir3CMhegrGCalrfnePgm5C2VFUxIlMudlXO /LnA6NXqCH6Gz/Jd7hwAQlKegiIj+GufFfxXcwl5qru4JPpRjEFXFmYwWYwr8Jk/DRKQZ6IHhOM sXbVGfhX3LCPFm+fDMcNoqbZxCVsom5N843TUCq/Yo1yOiVTwFDY2oF+gGWbnV57jWVo8siZ9gf RrPyz6gBcXjNXrbtnrgmMLjfrk9TcUx9Opm7UQ/TcqgQe6hx20BLjiM98b/K/8VJgTzsO2L1eg+ oU8mlcTMQP3/jVhCuVAelMeedp8VWA73iKr8g= X-Received: by 2002:a05:6102:510e:b0:5ff:dcb9:9222 with SMTP id ada2fe7eead31-601deb2b6a8mr492842137.7.1773199428980; Tue, 10 Mar 2026 20:23:48 -0700 (PDT) X-Received: by 2002:a05:6102:510e:b0:5ff:dcb9:9222 with SMTP id ada2fe7eead31-601deb2b6a8mr492816137.7.1773199428587; Tue, 10 Mar 2026 20:23:48 -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.23.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:23:47 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:23:06 +0200 Subject: [PATCH v2 12/25] 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: <20260311-ubwc-rework-v2-12-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, 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/pANAwAKAYs8ij4CKSjVAcsmYgBpsOAeub//VZeYzLSiRPsy3mVca9T9Lf20GUVzD fwQSSSdEbmJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabDgHgAKCRCLPIo+Aiko 1dkPCACrAf1IYYTZl95PYbR0Onc4NkkXHJfcQjbyO47fcf5qTMXdzfZwaRwV5yHQ1sprgXpISkm lWmS7W32c3ibD5JaHltliQFkt0eukwfZSBku0+DRfkGRjLiv/L3D2Qllo4FvYzVoe5Wr4c0TqPY 61Bu+tSP/Pgzbvpivu4Cojejo2nRqgiv7h28/yzvoo8Z0zKNOhSf9d+tn8OsgVpjNjEi2dSzZ0F S3TT436BdQFY4fBVhUJyqCVfMYL3gJcvkPIuoNqViNikfVggmMau9g4DC+nsDw3DTAL5P3EoJxH LnidAB5JalxfOl6WwpZmBJUC/O95iPLOQKkoCvrUBUTtm0Bg X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfX2EpT/aTEzDiK M2bLK9UqJyTTDJurJ0pKAiGh23iySXOH5yqWCr5oLMMqyao7mJ7rWHam7I9r2m8BC+XQKZTAalt UhSkMKtXmknoChxYF2rjHn2NH9OgXUGfIPHbrDjmlS7xUU6m7iK+6ryOlk21Glp/izlXclS3Lo+ zbR/kg3MneSCH7nusa+RMULq6RlNG1CDwrz2ZNQJBYs7YK1DkSuMj7qW7G9jLwH+JBFhtEYRmbV YbvkXnFMfSxoz3htC4s7NCCw+HgArMkXX6spRIDbOH9DhnsDBPDGwb5sab9F1qTabdxklSUeZDZ R9FUKJTXk3RF56l5eOlVGPWmaDjOFlP6KHlPs4CrULi6BG4nN2CmtjxqJniBhxBJjLA4qN8Shcs Pm9xnR5LMiv4wJFvd5ThU+YrhF1M6GC4act5BwxShnAD+2/PGfx7HV1iSin/X1FxyYoMaEOdEFU nuL0f8P0ic3IyHOFZVg== X-Proofpoint-GUID: y2Yvn_RZXRie56tLBRGFcXEK83wnP8Ri X-Authority-Analysis: v=2.4 cv=S5vUAYsP c=1 sm=1 tr=0 ts=69b0e045 cx=c_pps a=5HAIKLe1ejAbszaTRHs9Ug==: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=0JjmiBfSQHijSEXDZO0A:9 a=QEXdDO2ut3YA:10 a=gYDTvv6II1OnSo0itH1n:22 X-Proofpoint-ORIG-GUID: y2Yvn_RZXRie56tLBRGFcXEK83wnP8Ri 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 phishscore=0 impostorscore=0 lowpriorityscore=0 clxscore=1015 suspectscore=0 malwarescore=0 adultscore=0 bulkscore=0 spamscore=0 priorityscore=1501 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" 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