@@ -662,12 +662,12 @@ 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;
+ 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;
bool amsbc = cfg->ubwc_enc_version >= UBWC_3_0;
u32 hbb_hi = hbb >> 2;
u32 hbb_lo = hbb & 3;
- u32 level2_swizzling_dis = !(adreno_gpu->ubwc_config.ubwc_swizzle & 2);
gpu_write(gpu, REG_A6XX_RB_NC_MODE_CNTL,
level2_swizzling_dis << 12 |