drm/msm/adreno: Move hwcg table into a6xx specific info

Introduce a6xx_info where we can stash gen specific stuff without
polluting the toplevel adreno_info struct.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/599728/

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_catalog.c b/drivers/gpu/drm/msm/adreno/a6xx_catalog.c
index bcc2f4d8cfc6b27ed28436e69074d2a732df65e8..b81bcae59ac375313866f5e8d3aff0b0e1abb44a 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a6xx_catalog.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_catalog.c
@@ -7,6 +7,7 @@
  */
 
 #include "adreno_gpu.h"
+#include "a6xx_gpu.h"
 #include "a6xx.xml.h"
 #include "a6xx_gmu.xml.h"
 
@@ -465,7 +466,9 @@ static const struct adreno_info a6xx_gpus[] = {
                .inactive_period = DRM_MSM_INACTIVE_PERIOD,
                .init = a6xx_gpu_init,
                .zapfw = "a610_zap.mdt",
-               .hwcg = a612_hwcg,
+               .a6xx = &(const struct a6xx_info) {
+                       .hwcg = a612_hwcg,
+               },
                /*
                 * There are (at least) three SoCs implementing A610: SM6125
                 * (trinket), SM6115 (bengal) and SM6225 (khaje). Trinket does
@@ -493,7 +496,9 @@ static const struct adreno_info a6xx_gpus[] = {
                .quirks = ADRENO_QUIRK_HAS_CACHED_COHERENT,
                .init = a6xx_gpu_init,
                .zapfw = "a615_zap.mbn",
-               .hwcg = a615_hwcg,
+               .a6xx = &(const struct a6xx_info) {
+                       .hwcg = a615_hwcg,
+               },
                .speedbins = ADRENO_SPEEDBINS(
                        { 0,   0 },
                        { 128, 1 },
@@ -513,6 +518,8 @@ static const struct adreno_info a6xx_gpus[] = {
                .inactive_period = DRM_MSM_INACTIVE_PERIOD,
                .quirks = ADRENO_QUIRK_HAS_CACHED_COHERENT,
                .init = a6xx_gpu_init,
+               .a6xx = &(const struct a6xx_info) {
+               },
                .speedbins = ADRENO_SPEEDBINS(
                        { 0,   0 },
                        { 169, 1 },
@@ -531,7 +538,9 @@ static const struct adreno_info a6xx_gpus[] = {
                .inactive_period = DRM_MSM_INACTIVE_PERIOD,
                .init = a6xx_gpu_init,
                .zapfw = "a615_zap.mdt",
-               .hwcg = a615_hwcg,
+               .a6xx = &(const struct a6xx_info) {
+                       .hwcg = a615_hwcg,
+               },
                .speedbins = ADRENO_SPEEDBINS(
                        { 0,   0 },
                        { 138, 1 },
@@ -550,7 +559,9 @@ static const struct adreno_info a6xx_gpus[] = {
                .inactive_period = DRM_MSM_INACTIVE_PERIOD,
                .init = a6xx_gpu_init,
                .zapfw = "a615_zap.mdt",
-               .hwcg = a615_hwcg,
+               .a6xx = &(const struct a6xx_info) {
+                       .hwcg = a615_hwcg,
+               },
                .speedbins = ADRENO_SPEEDBINS(
                        { 0,   0 },
                        { 190, 1 },
@@ -569,7 +580,9 @@ static const struct adreno_info a6xx_gpus[] = {
                .quirks = ADRENO_QUIRK_HAS_CACHED_COHERENT,
                .init = a6xx_gpu_init,
                .zapfw = "a615_zap.mdt",
-               .hwcg = a615_hwcg,
+               .a6xx = &(const struct a6xx_info) {
+                       .hwcg = a615_hwcg,
+               },
                .speedbins = ADRENO_SPEEDBINS(
                        { 0,   0 },
                        { 120, 4 },
@@ -593,7 +606,9 @@ static const struct adreno_info a6xx_gpus[] = {
                .quirks = ADRENO_QUIRK_HAS_CACHED_COHERENT,
                .init = a6xx_gpu_init,
                .zapfw = "a630_zap.mdt",
-               .hwcg = a630_hwcg,
+               .a6xx = &(const struct a6xx_info) {
+                       .hwcg = a630_hwcg,
+               },
        }, {
                .chip_ids = ADRENO_CHIP_IDS(0x06040001),
                .family = ADRENO_6XX_GEN2,
@@ -607,7 +622,9 @@ static const struct adreno_info a6xx_gpus[] = {
                .quirks = ADRENO_QUIRK_HAS_CACHED_COHERENT,
                .init = a6xx_gpu_init,
                .zapfw = "a640_zap.mdt",
-               .hwcg = a640_hwcg,
+               .a6xx = &(const struct a6xx_info) {
+                       .hwcg = a640_hwcg,
+               },
                .speedbins = ADRENO_SPEEDBINS(
                        { 0, 0 },
                        { 1, 1 },
@@ -626,7 +643,9 @@ static const struct adreno_info a6xx_gpus[] = {
                        ADRENO_QUIRK_HAS_HW_APRIV,
                .init = a6xx_gpu_init,
                .zapfw = "a650_zap.mdt",
-               .hwcg = a650_hwcg,
+               .a6xx = &(const struct a6xx_info) {
+                       .hwcg = a650_hwcg,
+               },
                .address_space_size = SZ_16G,
                .speedbins = ADRENO_SPEEDBINS(
                        { 0, 0 },
@@ -648,7 +667,9 @@ static const struct adreno_info a6xx_gpus[] = {
                        ADRENO_QUIRK_HAS_HW_APRIV,
                .init = a6xx_gpu_init,
                .zapfw = "a660_zap.mdt",
-               .hwcg = a660_hwcg,
+               .a6xx = &(const struct a6xx_info) {
+                       .hwcg = a660_hwcg,
+               },
                .address_space_size = SZ_16G,
        }, {
                .chip_ids = ADRENO_CHIP_IDS(0x06030500),
@@ -663,7 +684,9 @@ static const struct adreno_info a6xx_gpus[] = {
                        ADRENO_QUIRK_HAS_HW_APRIV,
                .init = a6xx_gpu_init,
                .zapfw = "a660_zap.mbn",
-               .hwcg = a660_hwcg,
+               .a6xx = &(const struct a6xx_info) {
+                       .hwcg = a660_hwcg,
+               },
                .address_space_size = SZ_16G,
                .speedbins = ADRENO_SPEEDBINS(
                        { 0,   0 },
@@ -684,7 +707,9 @@ static const struct adreno_info a6xx_gpus[] = {
                .quirks = ADRENO_QUIRK_HAS_CACHED_COHERENT,
                .init = a6xx_gpu_init,
                .zapfw = "a640_zap.mdt",
-               .hwcg = a640_hwcg,
+               .a6xx = &(const struct a6xx_info) {
+                       .hwcg = a640_hwcg,
+               },
        }, {
                .chip_ids = ADRENO_CHIP_IDS(0x06090000),
                .family = ADRENO_6XX_GEN4,
@@ -698,7 +723,9 @@ static const struct adreno_info a6xx_gpus[] = {
                        ADRENO_QUIRK_HAS_HW_APRIV,
                .init = a6xx_gpu_init,
                .zapfw = "a690_zap.mdt",
-               .hwcg = a690_hwcg,
+               .a6xx = &(const struct a6xx_info) {
+                       .hwcg = a690_hwcg,
+               },
                .address_space_size = SZ_16G,
        }
 };
@@ -901,7 +928,9 @@ static const struct adreno_info a7xx_gpus[] = {
                .quirks = ADRENO_QUIRK_HAS_HW_APRIV,
                .init = a6xx_gpu_init,
                .zapfw = "a702_zap.mbn",
-               .hwcg = a702_hwcg,
+               .a6xx = &(const struct a6xx_info) {
+                       .hwcg = a702_hwcg,
+               },
                .speedbins = ADRENO_SPEEDBINS(
                        { 0,   0 },
                        { 236, 1 },
@@ -921,7 +950,9 @@ static const struct adreno_info a7xx_gpus[] = {
                          ADRENO_QUIRK_HAS_HW_APRIV,
                .init = a6xx_gpu_init,
                .zapfw = "a730_zap.mdt",
-               .hwcg = a730_hwcg,
+               .a6xx = &(const struct a6xx_info) {
+                       .hwcg = a730_hwcg,
+               },
                .address_space_size = SZ_16G,
        }, {
                .chip_ids = ADRENO_CHIP_IDS(0x43050a01), /* "C510v2" */
@@ -936,7 +967,9 @@ static const struct adreno_info a7xx_gpus[] = {
                          ADRENO_QUIRK_HAS_HW_APRIV,
                .init = a6xx_gpu_init,
                .zapfw = "a740_zap.mdt",
-               .hwcg = a740_hwcg,
+               .a6xx = &(const struct a6xx_info) {
+                       .hwcg = a740_hwcg,
+               },
                .address_space_size = SZ_16G,
        }, {
                .chip_ids = ADRENO_CHIP_IDS(0x43051401), /* "C520v2" */
@@ -951,6 +984,8 @@ static const struct adreno_info a7xx_gpus[] = {
                          ADRENO_QUIRK_HAS_HW_APRIV,
                .init = a6xx_gpu_init,
                .zapfw = "gen70900_zap.mbn",
+               .a6xx = &(const struct a6xx_info) {
+               },
                .address_space_size = SZ_16G,
        }
 };

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
index 99310786ecd71d31736d6821fcdf45ab725c41b0..38eb6f32a179b543cfebd60d5936857c39469b4b 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
@@ -403,7 +403,7 @@ static void a6xx_set_hwcg(struct msm_gpu *gpu, bool state)
        unsigned int i;
        u32 val, clock_cntl_on, cgc_mode;
 
-       if (!(adreno_gpu->info->hwcg || adreno_is_a7xx(adreno_gpu)))
+       if (!(adreno_gpu->info->a6xx->hwcg || adreno_is_a7xx(adreno_gpu)))
                return;
 
        if (adreno_is_a630(adreno_gpu))
@@ -426,7 +426,7 @@ static void a6xx_set_hwcg(struct msm_gpu *gpu, bool state)
                          state ? 0x5555 : 0);
        }
 
-       if (!adreno_gpu->info->hwcg) {
+       if (!adreno_gpu->info->a6xx->hwcg) {
                gpu_write(gpu, REG_A7XX_RBBM_CLOCK_CNTL_GLOBAL, 1);
                gpu_write(gpu, REG_A7XX_RBBM_CGC_GLOBAL_LOAD_CMD, state ? 1 : 0);
 
@@ -455,7 +455,7 @@ static void a6xx_set_hwcg(struct msm_gpu *gpu, bool state)
        if (!adreno_is_a610_family(adreno_gpu) && !adreno_is_a7xx(adreno_gpu))
                gmu_rmw(gmu, REG_A6XX_GPU_GMU_GX_SPTPRAC_CLOCK_CONTROL, 1, 0);
 
-       for (i = 0; (reg = &adreno_gpu->info->hwcg[i], reg->offset); i++)
+       for (i = 0; (reg = &adreno_gpu->info->a6xx->hwcg[i], reg->offset); i++)
                gpu_write(gpu, reg->offset, state ? reg->value : 0);
 
        /* Enable SP clock */

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.h b/drivers/gpu/drm/msm/adreno/a6xx_gpu.h
index 8917032b75156804fc5950ab96178d9e254cb3ad..2fc7cf6b2d72e86a877ab753cff62aa60b0e35ee 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.h
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.h
@@ -12,6 +12,15 @@
 
 extern bool hang_debug;
 
+/**
+ * struct a6xx_info - a6xx specific information from device table
+ *
+ * @hwcg: hw clock gating register sequence
+ */
+struct a6xx_info {
+       const struct adreno_reglist *hwcg;
+};
+
 struct a6xx_gpu {
        struct adreno_gpu base;
 

diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
index 695e00ae1f62f8de6a4c187e8e3c3435c7e4d8c3..13e68222228fdee85d9dd5214d4561a9d3be6f35 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
@@ -82,6 +82,8 @@ struct adreno_speedbin {
        uint16_t speedbin;
 };
 
+struct a6xx_info;
+
 struct adreno_info {
        const char *machine;
        /**
@@ -98,7 +100,9 @@ struct adreno_info {
        struct msm_gpu *(*init)(struct drm_device *dev);
        const char *zapfw;
        u32 inactive_period;
-       const struct adreno_reglist *hwcg;
+       union {
+               const struct a6xx_info *a6xx;
+       };
        u64 address_space_size;
        /**
         * @speedbins: Optional table of fuse to speedbin mappings