[PATCH RFT 11/14] drm/msm/a6xx: Simplify min_acc_len calculation

[Konrad Dybcio]

From: Konrad Dybcio <konrad.dyb...@oss.qualcomm.com>

It's only necessary for some lower end parts.
Also rename it to min_acc_len_64b to denote that if set, the minimum
access length is 64 bits, 32b otherwise.

Signed-off-by: Konrad Dybcio <konrad.dyb...@oss.qualcomm.com>
---
 drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c 
b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
index 
bee7e9685aa3ea282fb20ef479e4d243d28418f7..d297890dfba60c6110fb8571e1f46729390302ed
 100644
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
@@ -592,13 +592,11 @@ static int a6xx_calc_ubwc_config(struct adreno_gpu *gpu)
        if (IS_ERR(gpu->common_ubwc_cfg))
                return -EINVAL;
 
-       gpu->ubwc_config.min_acc_len = 0;
        gpu->ubwc_config.ubwc_swizzle = 0x6;
        gpu->ubwc_config.highest_bank_bit = 2;
 
        if (adreno_is_a610(gpu)) {
                gpu->ubwc_config.highest_bank_bit = 0;
-               gpu->ubwc_config.min_acc_len = 1;
                gpu->ubwc_config.ubwc_swizzle = 0x7;
        }
 
@@ -635,10 +633,8 @@ static int a6xx_calc_ubwc_config(struct adreno_gpu *gpu)
        if (adreno_is_7c3(gpu))
                gpu->ubwc_config.highest_bank_bit = 1;
 
-       if (adreno_is_a702(gpu)) {
+       if (adreno_is_a702(gpu))
                gpu->ubwc_config.highest_bank_bit = 1;
-               gpu->ubwc_config.min_acc_len = 1;
-       }
 
        return 0;
 }
@@ -647,6 +643,7 @@ static void a6xx_set_ubwc_config(struct msm_gpu *gpu)
 {
        struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
        u8 uavflagprd_inv = adreno_is_a650_family(adreno_gpu) || 
adreno_is_a7xx(adreno_gpu) ? 2 : 0;
+       bool min_acc_len_64b = adreno_is_a610(adreno_gpu) || 
adreno_is_a702(adreno_gpu);
        const struct qcom_ubwc_cfg_data *cfg = adreno_gpu->common_ubwc_cfg;
        bool rgb565_predicator = cfg->ubwc_enc_version >= UBWC_4_0;
        u32 level2_swizzling_dis = !(cfg->ubwc_swizzle & BIT(1));
@@ -660,18 +657,18 @@ static void a6xx_set_ubwc_config(struct msm_gpu *gpu)
                  level2_swizzling_dis << 12 |
                  rgb565_predicator << 11 |
                  hbb_hi << 10 | amsbc << 4 |
-                 adreno_gpu->ubwc_config.min_acc_len << 3 |
+                 min_acc_len_64b << 3 |
                  hbb_lo << 1 | ubwc_mode);
 
        gpu_write(gpu, REG_A6XX_TPL1_NC_MODE_CNTL,
                  level2_swizzling_dis << 6 | hbb_hi << 4 |
-                 adreno_gpu->ubwc_config.min_acc_len << 3 |
+                 min_acc_len_64b << 3 |
                  hbb_lo << 1 | ubwc_mode);
 
        gpu_write(gpu, REG_A6XX_SP_NC_MODE_CNTL,
                  level2_swizzling_dis << 12 | hbb_hi << 10 |
                  uavflagprd_inv << 4 |
-                 adreno_gpu->ubwc_config.min_acc_len << 3 |
+                 min_acc_len_64b << 3 |
                  hbb_lo << 1 | ubwc_mode);
 
        if (adreno_is_a7xx(adreno_gpu))
@@ -679,7 +676,7 @@ static void a6xx_set_ubwc_config(struct msm_gpu *gpu)
                          FIELD_PREP(GENMASK(8, 5), hbb_lo));
 
        gpu_write(gpu, REG_A6XX_UCHE_MODE_CNTL,
-                 adreno_gpu->ubwc_config.min_acc_len << 23 | hbb_lo << 21);
+                 min_acc_len_64b << 23 | hbb_lo << 21);
 
        /* The reset value only needs altering in some cases */
        if (adreno_is_a680(adreno_gpu) || adreno_is_a663(adreno_gpu))

-- 
2.49.0