drm/msm: Fix UBWC macrotile_mode for a680

Make it match the MDSS settings for sc8180x and downstream.

Note that without the previous commit that exposes the value of
macrotile_mode to mesa, this will break mesa which expects the legacy
default value of 0. Therefore we do *not* want to backport it.

Signed-off-by: Connor Abbott <cwabbott0@gmail.com>
Patchwork: https://patchwork.freedesktop.org/patch/607398/
Signed-off-by: Rob Clark <robdclark@chromium.org>

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
index 7c2fdd1..7ceca63 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
@@ -519,6 +519,9 @@ static void a6xx_calc_ubwc_config(struct adreno_gpu *gpu)
        if (adreno_is_a640_family(gpu))
                gpu->ubwc_config.amsbc = 1;
 
+       if (adreno_is_a680(gpu))
+               gpu->ubwc_config.macrotile_mode = 1;
+
        if (adreno_is_a650(gpu) ||
            adreno_is_a660(gpu) ||
            adreno_is_a690(gpu) ||