drm/msm/adreno: use new helper to set amsbc

Use freshly defined helper instead of checking the UBWC version
directly.

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Reviewed-by: Akhil P Oommen <akhilpo@oss.qualcomm.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/726523/
Link: https://lore.kernel.org/r/20260520-ubwc-rework-v5-17-72f2749bc807@oss.qualcomm.com

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
index e7a0d315e02212f1f183a9701c61c71ec2747485..1c5ad3e83cc2c229fd08472601cecf240d7364e5 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
@@ -747,7 +747,7 @@ static void a6xx_set_ubwc_config(struct msm_gpu *gpu)
        bool rgb565_predicator = cfg->ubwc_enc_version >= UBWC_4_0;
        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 amsbc = qcom_ubwc_enable_amsbc(cfg);
        bool min_acc_len_64b;
        u8 uavflagprd_inv = 0;
        u32 hbb_hi = hbb >> 2;

diff --git a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c b/drivers/gpu/drm/msm/adreno/a8xx_gpu.c
index 867c7d05f670ece036feac0c596a2d2202139ab2..5c73a9ebb22bb19b435b505962b4b090c06c1558 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a8xx_gpu.c
@@ -279,7 +279,8 @@ static void a8xx_set_ubwc_config(struct msm_gpu *gpu)
        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;
+       bool rgb565_predicator = false;
+       bool amsbc = qcom_ubwc_enable_amsbc(cfg);
        bool ubwc_mode = qcom_ubwc_get_ubwc_mode(cfg);
        u32 ubwc_version = cfg->ubwc_enc_version;
        u32 hbb, hbb_hi, hbb_lo, mode;
@@ -288,21 +289,17 @@ static void a8xx_set_ubwc_config(struct msm_gpu *gpu)
        switch (ubwc_version) {
        case UBWC_6_0:
                yuvnotcomptofc = true;
-               amsbc = true;
                rgb565_predicator = true;
                break;
        case UBWC_5_0:
-               amsbc = true;
                rgb565_predicator = true;
                break;
        case UBWC_4_0:
-               amsbc = true;
                rgb565_predicator = true;
                fp16compoptdis = true;
                rgba8888_lossless = true;
                break;
        case UBWC_3_0:
-               amsbc = true;
                fp16compoptdis = true;
                break;
        default: