[PATCH RFT 09/14] drm/msm/a6xx: Resolve the meaning of rgb565_predicator

[Konrad Dybcio]

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

It's supposed to be on when the UBWC encoder version is >= 4.0.
Drop the per-GPU assignments.

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

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c 
b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
index 
afe4fa8e9325988af37ff12adb61faae66d746ba..60f89a2d851a5c383fc14cce4c483f630132a9a6
 100644
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
@@ -592,7 +592,6 @@ static int a6xx_calc_ubwc_config(struct adreno_gpu *gpu)
        if (IS_ERR(gpu->common_ubwc_cfg))
                return -EINVAL;
 
-       gpu->ubwc_config.rgb565_predicator = 0;
        gpu->ubwc_config.min_acc_len = 0;
        gpu->ubwc_config.ubwc_swizzle = 0x6;
        gpu->ubwc_config.macrotile_mode = 0;
@@ -619,7 +618,6 @@ static int a6xx_calc_ubwc_config(struct adreno_gpu *gpu)
 
        if (adreno_is_a623(gpu)) {
                gpu->ubwc_config.highest_bank_bit = 3;
-               gpu->ubwc_config.rgb565_predicator = 1;
                gpu->ubwc_config.macrotile_mode = 1;
        }
 
@@ -633,13 +631,11 @@ static int a6xx_calc_ubwc_config(struct adreno_gpu *gpu)
            adreno_is_a740_family(gpu)) {
                /* TODO: get ddr type from bootloader and use 2 for LPDDR4 */
                gpu->ubwc_config.highest_bank_bit = 3;
-               gpu->ubwc_config.rgb565_predicator = 1;
                gpu->ubwc_config.macrotile_mode = 1;
        }
 
        if (adreno_is_a663(gpu)) {
                gpu->ubwc_config.highest_bank_bit = 0;
-               gpu->ubwc_config.rgb565_predicator = 1;
                gpu->ubwc_config.macrotile_mode = 1;
                gpu->ubwc_config.ubwc_swizzle = 0x4;
        }
@@ -662,6 +658,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;
        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));
        u32 hbb = adreno_gpu->ubwc_config.highest_bank_bit;
        bool ubwc_mode = cfg->ubwc_enc_version == UBWC_1_0;
@@ -671,7 +668,7 @@ static void a6xx_set_ubwc_config(struct msm_gpu *gpu)
 
        gpu_write(gpu, REG_A6XX_RB_NC_MODE_CNTL,
                  level2_swizzling_dis << 12 |
-                 adreno_gpu->ubwc_config.rgb565_predicator << 11 |
+                 rgb565_predicator << 11 |
                  hbb_hi << 10 | amsbc << 4 |
                  adreno_gpu->ubwc_config.min_acc_len << 3 |
                  hbb_lo << 1 | ubwc_mode);

-- 
2.49.0