drm/msm/adreno: Switch to the common UBWC config struct

Now that Adreno specifics are out of the way, use the common config
(but leave the HBB hardcoding in place until that is wired up on the
other side).

Acked-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/660985/
Signed-off-by: Rob Clark <robin.clark@oss.qualcomm.com>

diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
index ee927d8cc0dc68ebea6c8cffe55a69c8fb84dffc..4a04dc43a8e6764a113d0ade3dee94bd4c0083af 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
@@ -835,8 +835,8 @@ static int a5xx_hw_init(struct msm_gpu *gpu)
 
        gpu_write(gpu, REG_A5XX_RBBM_AHB_CNTL2, 0x0000003F);
 
-       BUG_ON(adreno_gpu->ubwc_config.highest_bank_bit < 13);
-       hbb = adreno_gpu->ubwc_config.highest_bank_bit - 13;
+       BUG_ON(adreno_gpu->ubwc_config->highest_bank_bit < 13);
+       hbb = adreno_gpu->ubwc_config->highest_bank_bit - 13;
 
        gpu_write(gpu, REG_A5XX_TPL1_MODE_CNTL, hbb << 7);
        gpu_write(gpu, REG_A5XX_RB_MODE_CNTL, hbb << 1);
@@ -1756,6 +1756,7 @@ struct msm_gpu *a5xx_gpu_init(struct drm_device *dev)
        struct msm_drm_private *priv = dev->dev_private;
        struct platform_device *pdev = priv->gpu_pdev;
        struct adreno_platform_config *config = pdev->dev.platform_data;
+       const struct qcom_ubwc_cfg_data *common_cfg;
        struct a5xx_gpu *a5xx_gpu = NULL;
        struct adreno_gpu *adreno_gpu;
        struct msm_gpu *gpu;
@@ -1792,15 +1793,14 @@ struct msm_gpu *a5xx_gpu_init(struct drm_device *dev)
        /* Set up the preemption specific bits and pieces for each ringbuffer */
        a5xx_preempt_init(gpu);
 
-       /* Set the highest bank bit */
-       if (adreno_is_a540(adreno_gpu) || adreno_is_a530(adreno_gpu))
-               adreno_gpu->ubwc_config.highest_bank_bit = 15;
-       else
-               adreno_gpu->ubwc_config.highest_bank_bit = 14;
+       /* Inherit the common config and make some necessary fixups */
+       common_cfg = qcom_ubwc_config_get_data();
+       if (IS_ERR(common_cfg))
+               return ERR_CAST(common_cfg);
 
-       /* a5xx only supports UBWC 1.0, these are not configurable */
-       adreno_gpu->ubwc_config.macrotile_mode = 0;
-       adreno_gpu->ubwc_config.ubwc_swizzle = 0x7;
+       /* Copy the data into the internal struct to drop the const qualifier (temporarily) */
+       adreno_gpu->_ubwc_config = *common_cfg;
+       adreno_gpu->ubwc_config = &adreno_gpu->_ubwc_config;
 
        adreno_gpu->uche_trap_base = 0x0001ffffffff0000ull;
 

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
index d83133f39522ca4c9425c818c10b81e670c11edc..45dd5fd1c2bfcb0a01b71a326c7d95b0f9496d99 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
@@ -606,64 +606,70 @@ static void a6xx_set_cp_protect(struct msm_gpu *gpu)
 
 static int a6xx_calc_ubwc_config(struct adreno_gpu *gpu)
 {
+       const struct qcom_ubwc_cfg_data *common_cfg;
+       struct qcom_ubwc_cfg_data *cfg = &gpu->_ubwc_config;
+
        /* Inherit the common config and make some necessary fixups */
-       gpu->common_ubwc_cfg = qcom_ubwc_config_get_data();
-       if (IS_ERR(gpu->common_ubwc_cfg))
-               return PTR_ERR(gpu->common_ubwc_cfg);
+       common_cfg = qcom_ubwc_config_get_data();
+       if (IS_ERR(common_cfg))
+               return PTR_ERR(common_cfg);
+
+       /* Copy the data into the internal struct to drop the const qualifier (temporarily) */
+       *cfg = *common_cfg;
 
-       gpu->ubwc_config.ubwc_swizzle = 0x6;
-       gpu->ubwc_config.macrotile_mode = 0;
-       gpu->ubwc_config.highest_bank_bit = 15;
+       cfg->ubwc_swizzle = 0x6;
+       cfg->highest_bank_bit = 15;
 
        if (adreno_is_a610(gpu)) {
-               gpu->ubwc_config.highest_bank_bit = 13;
-               gpu->ubwc_config.ubwc_swizzle = 0x7;
+               cfg->highest_bank_bit = 13;
+               cfg->ubwc_swizzle = 0x7;
        }
 
        if (adreno_is_a618(gpu))
-               gpu->ubwc_config.highest_bank_bit = 14;
+               cfg->highest_bank_bit = 14;
 
        if (adreno_is_a619(gpu))
                /* TODO: Should be 14 but causes corruption at e.g. 1920x1200 on DP */
-               gpu->ubwc_config.highest_bank_bit = 13;
+               cfg->highest_bank_bit = 13;
 
        if (adreno_is_a619_holi(gpu))
-               gpu->ubwc_config.highest_bank_bit = 13;
+               cfg->highest_bank_bit = 13;
 
        if (adreno_is_a621(gpu))
-               gpu->ubwc_config.highest_bank_bit = 13;
-
-       if (adreno_is_a623(gpu)) {
-               gpu->ubwc_config.highest_bank_bit = 16;
-               gpu->ubwc_config.macrotile_mode = 1;
-       }
+               cfg->highest_bank_bit = 13;
 
-       if (adreno_is_a680(gpu))
-               gpu->ubwc_config.macrotile_mode = 1;
+       if (adreno_is_a623(gpu))
+               cfg->highest_bank_bit = 16;
 
        if (adreno_is_a650(gpu) ||
            adreno_is_a660(gpu) ||
            adreno_is_a690(gpu) ||
            adreno_is_a730(gpu) ||
            adreno_is_a740_family(gpu)) {
-               /* TODO: get ddr type from bootloader and use 2 for LPDDR4 */
-               gpu->ubwc_config.highest_bank_bit = 16;
-               gpu->ubwc_config.macrotile_mode = 1;
+               /* TODO: get ddr type from bootloader and use 15 for LPDDR4 */
+               cfg->highest_bank_bit = 16;
        }
 
        if (adreno_is_a663(gpu)) {
-               gpu->ubwc_config.highest_bank_bit = 13;
-               gpu->ubwc_config.macrotile_mode = 1;
-               gpu->ubwc_config.ubwc_swizzle = 0x4;
+               cfg->highest_bank_bit = 13;
+               cfg->ubwc_swizzle = 0x4;
        }
 
-       if (adreno_is_7c3(gpu)) {
-               gpu->ubwc_config.highest_bank_bit = 14;
-               gpu->ubwc_config.macrotile_mode = 1;
-       }
+       if (adreno_is_7c3(gpu))
+               cfg->highest_bank_bit = 14;
 
        if (adreno_is_a702(gpu))
-               gpu->ubwc_config.highest_bank_bit = 14;
+               cfg->highest_bank_bit = 14;
+
+       if (cfg->highest_bank_bit != common_cfg->highest_bank_bit)
+               DRM_WARN_ONCE("Inconclusive highest_bank_bit value: %u (GPU) vs %u (UBWC_CFG)\n",
+                             cfg->highest_bank_bit, common_cfg->highest_bank_bit);
+
+       if (cfg->ubwc_swizzle != common_cfg->ubwc_swizzle)
+               DRM_WARN_ONCE("Inconclusive ubwc_swizzle value: %u (GPU) vs %u (UBWC_CFG)\n",
+                             cfg->ubwc_swizzle, common_cfg->ubwc_swizzle);
+
+       gpu->ubwc_config = &gpu->_ubwc_config;
 
        return 0;
 }
@@ -671,14 +677,14 @@ static int a6xx_calc_ubwc_config(struct adreno_gpu *gpu)
 static void a6xx_set_ubwc_config(struct msm_gpu *gpu)
 {
        struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
-       const struct qcom_ubwc_cfg_data *cfg = adreno_gpu->common_ubwc_cfg;
+       const struct qcom_ubwc_cfg_data *cfg = adreno_gpu->ubwc_config;
        /*
         * We subtract 13 from the highest bank bit (13 is the minimum value
         * allowed by hw) and write the lowest two bits of the remaining value
         * as hbb_lo and the one above it as hbb_hi to the hardware.
         */
-       BUG_ON(adreno_gpu->ubwc_config.highest_bank_bit < 13);
-       u32 hbb = adreno_gpu->ubwc_config.highest_bank_bit - 13;
+       BUG_ON(cfg->highest_bank_bit < 13);
+       u32 hbb = cfg->highest_bank_bit - 13;
        bool rgb565_predicator = cfg->ubwc_enc_version >= UBWC_4_0;
        u32 level2_swizzling_dis = !(cfg->ubwc_swizzle & UBWC_SWIZZLE_ENABLE_LVL2);
        bool ubwc_mode = qcom_ubwc_get_ubwc_mode(cfg);
@@ -720,7 +726,7 @@ static void a6xx_set_ubwc_config(struct msm_gpu *gpu)
                  min_acc_len_64b << 23 | hbb_lo << 21);
 
        gpu_write(gpu, REG_A6XX_RBBM_NC_MODE_CNTL,
-                 adreno_gpu->ubwc_config.macrotile_mode);
+                 cfg->macrotile_mode);
 }
 
 static void a7xx_patch_pwrup_reglist(struct msm_gpu *gpu)

diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
index 53cbfa5a507b4299818ba8dfe660a09060654459..f1230465bf0d0840274a6eb03a10c4df3a7a68d3 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
@@ -435,16 +435,16 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_context *ctx,
                *value = vm->mm_range;
                return 0;
        case MSM_PARAM_HIGHEST_BANK_BIT:
-               *value = adreno_gpu->ubwc_config.highest_bank_bit;
+               *value = adreno_gpu->ubwc_config->highest_bank_bit;
                return 0;
        case MSM_PARAM_RAYTRACING:
                *value = adreno_gpu->has_ray_tracing;
                return 0;
        case MSM_PARAM_UBWC_SWIZZLE:
-               *value = adreno_gpu->ubwc_config.ubwc_swizzle;
+               *value = adreno_gpu->ubwc_config->ubwc_swizzle;
                return 0;
        case MSM_PARAM_MACROTILE_MODE:
-               *value = adreno_gpu->ubwc_config.macrotile_mode;
+               *value = adreno_gpu->ubwc_config->macrotile_mode;
                return 0;
        case MSM_PARAM_UCHE_TRAP_BASE:
                *value = adreno_gpu->uche_trap_base;

diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
index 3fc7bb45d28b45131c376924d48cff81ccfa4663..9dc93c247196d5b8b3659157f7aeea81809d4056 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
@@ -206,45 +206,12 @@ struct adreno_gpu {
        /* firmware: */
        const struct firmware *fw[ADRENO_FW_MAX];
 
-       struct {
-               /**
-                * @rgb565_predicator: Unknown, introduced with A650 family,
-                * related to UBWC mode/ver 4
-                */
-               u32 rgb565_predicator;
-               /** @uavflagprd_inv: Unknown, introduced with A650 family */
-               u32 uavflagprd_inv;
-               /** @min_acc_len: Whether the minimum access length is 64 bits */
-               u32 min_acc_len;
-               /**
-                * @ubwc_swizzle: Whether to enable level 1, 2 & 3 bank swizzling.
-                *
-                * UBWC 1.0 always enables all three levels.
-                * UBWC 2.0 removes level 1 bank swizzling, leaving levels 2 & 3.
-                * UBWC 4.0 adds the optional ability to disable levels 2 & 3.
-                *
-                * This is a bitmask where BIT(0) enables level 1, BIT(1)
-                * controls level 2, and BIT(2) enables level 3.
-                */
-               u32 ubwc_swizzle;
-               /**
-                * @highest_bank_bit: Highest Bank Bit
-                *
-                * The Highest Bank Bit value represents the bit of the highest
-                * DDR bank.  This should ideally use DRAM type detection.
-                */
-               u32 highest_bank_bit;
-               u32 amsbc;
-               /**
-                * @macrotile_mode: Macrotile Mode
-                *
-                * Whether to use 4-channel macrotiling mode or the newer
-                * 8-channel macrotiling mode introduced in UBWC 3.1. 0 is
-                * 4-channel and 1 is 8-channel.
-                */
-               u32 macrotile_mode;
-       } ubwc_config;
-       const struct qcom_ubwc_cfg_data *common_ubwc_cfg;
+       /*
+        * The migration to the central UBWC config db is still in flight - keep
+        * a copy containing some local fixups until that's done.
+        */
+       const struct qcom_ubwc_cfg_data *ubwc_config;
+       struct qcom_ubwc_cfg_data _ubwc_config;
 
        /*
         * Register offsets are different between some GPUs.