[PATCH RFT 13/14] drm/msm/a6xx: Drop cfg->ubwc_swizzle override

From: Konrad Dybcio
Date: Thu May 08 2025 - 14:16:35 EST


From: Konrad Dybcio <konrad.dybcio@xxxxxxxxxxxxxxxx>

On A663 (SA8775P) the value matches exactly.

On A610, the value matches on SM6115, but is different on SM6125. That
turns out not to be a problem, as the bits that differ aren't even
interpreted.

Signed-off-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
index 28ba0cddd7d222b0a287c7c3a111e123a73b1d39..d96f8cec854a36a77896d39b88c320c29c787edd 100644
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
@@ -597,13 +597,10 @@ static int a6xx_calc_ubwc_config(struct adreno_gpu *gpu)

*cfg = *common_cfg;

- cfg->ubwc_swizzle = 0x6;
cfg->highest_bank_bit = 2;

- if (adreno_is_a610(gpu)) {
+ if (adreno_is_a610(gpu))
cfg->highest_bank_bit = 0;
- cfg->ubwc_swizzle = 0x7;
- }

if (adreno_is_a618(gpu))
cfg->highest_bank_bit = 1;
@@ -630,10 +627,8 @@ static int a6xx_calc_ubwc_config(struct adreno_gpu *gpu)
cfg->highest_bank_bit = 3;
}

- if (adreno_is_a663(gpu)) {
+ if (adreno_is_a663(gpu))
cfg->highest_bank_bit = 0;
- cfg->ubwc_swizzle = 0x4;
- }

if (adreno_is_7c3(gpu))
cfg->highest_bank_bit = 1;

--
2.49.0