drm/msm/adreno: Remove GPU name

No real need to have marketing names in the kernel.

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

diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c
index ce8d0b2475bf12cef46d8c64597047b359c3a862..326912284a9502deae90094a9b87ea764d80187f 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/adreno_device.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_device.c
@@ -24,7 +24,6 @@ static const struct adreno_info gpulist[] = {
        {
                .rev   = ADRENO_REV(2, 0, 0, 0),
                .revn  = 200,
-               .name  = "A200",
                .fw = {
                        [ADRENO_FW_PM4] = "yamato_pm4.fw",
                        [ADRENO_FW_PFP] = "yamato_pfp.fw",
@@ -35,7 +34,6 @@ static const struct adreno_info gpulist[] = {
        }, { /* a200 on i.mx51 has only 128kib gmem */
                .rev   = ADRENO_REV(2, 0, 0, 1),
                .revn  = 201,
-               .name  = "A200",
                .fw = {
                        [ADRENO_FW_PM4] = "yamato_pm4.fw",
                        [ADRENO_FW_PFP] = "yamato_pfp.fw",
@@ -46,7 +44,6 @@ static const struct adreno_info gpulist[] = {
        }, {
                .rev   = ADRENO_REV(2, 2, 0, ANY_ID),
                .revn  = 220,
-               .name  = "A220",
                .fw = {
                        [ADRENO_FW_PM4] = "leia_pm4_470.fw",
                        [ADRENO_FW_PFP] = "leia_pfp_470.fw",
@@ -57,7 +54,6 @@ static const struct adreno_info gpulist[] = {
        }, {
                .rev   = ADRENO_REV(3, 0, 5, ANY_ID),
                .revn  = 305,
-               .name  = "A305",
                .fw = {
                        [ADRENO_FW_PM4] = "a300_pm4.fw",
                        [ADRENO_FW_PFP] = "a300_pfp.fw",
@@ -68,7 +64,6 @@ static const struct adreno_info gpulist[] = {
        }, {
                .rev   = ADRENO_REV(3, 0, 6, 0),
                .revn  = 307,        /* because a305c is revn==306 */
-               .name  = "A306",
                .fw = {
                        [ADRENO_FW_PM4] = "a300_pm4.fw",
                        [ADRENO_FW_PFP] = "a300_pfp.fw",
@@ -79,7 +74,6 @@ static const struct adreno_info gpulist[] = {
        }, {
                .rev   = ADRENO_REV(3, 2, ANY_ID, ANY_ID),
                .revn  = 320,
-               .name  = "A320",
                .fw = {
                        [ADRENO_FW_PM4] = "a300_pm4.fw",
                        [ADRENO_FW_PFP] = "a300_pfp.fw",
@@ -90,7 +84,6 @@ static const struct adreno_info gpulist[] = {
        }, {
                .rev   = ADRENO_REV(3, 3, 0, ANY_ID),
                .revn  = 330,
-               .name  = "A330",
                .fw = {
                        [ADRENO_FW_PM4] = "a330_pm4.fw",
                        [ADRENO_FW_PFP] = "a330_pfp.fw",
@@ -101,7 +94,6 @@ static const struct adreno_info gpulist[] = {
        }, {
                .rev   = ADRENO_REV(4, 0, 5, ANY_ID),
                .revn  = 405,
-               .name  = "A405",
                .fw = {
                        [ADRENO_FW_PM4] = "a420_pm4.fw",
                        [ADRENO_FW_PFP] = "a420_pfp.fw",
@@ -112,7 +104,6 @@ static const struct adreno_info gpulist[] = {
        }, {
                .rev   = ADRENO_REV(4, 2, 0, ANY_ID),
                .revn  = 420,
-               .name  = "A420",
                .fw = {
                        [ADRENO_FW_PM4] = "a420_pm4.fw",
                        [ADRENO_FW_PFP] = "a420_pfp.fw",
@@ -123,7 +114,6 @@ static const struct adreno_info gpulist[] = {
        }, {
                .rev   = ADRENO_REV(4, 3, 0, ANY_ID),
                .revn  = 430,
-               .name  = "A430",
                .fw = {
                        [ADRENO_FW_PM4] = "a420_pm4.fw",
                        [ADRENO_FW_PFP] = "a420_pfp.fw",
@@ -134,7 +124,6 @@ static const struct adreno_info gpulist[] = {
        }, {
                .rev   = ADRENO_REV(5, 0, 6, ANY_ID),
                .revn = 506,
-               .name = "A506",
                .fw = {
                        [ADRENO_FW_PM4] = "a530_pm4.fw",
                        [ADRENO_FW_PFP] = "a530_pfp.fw",
@@ -152,7 +141,6 @@ static const struct adreno_info gpulist[] = {
        }, {
                .rev   = ADRENO_REV(5, 0, 8, ANY_ID),
                .revn = 508,
-               .name = "A508",
                .fw = {
                        [ADRENO_FW_PM4] = "a530_pm4.fw",
                        [ADRENO_FW_PFP] = "a530_pfp.fw",
@@ -169,7 +157,6 @@ static const struct adreno_info gpulist[] = {
        }, {
                .rev   = ADRENO_REV(5, 0, 9, ANY_ID),
                .revn = 509,
-               .name = "A509",
                .fw = {
                        [ADRENO_FW_PM4] = "a530_pm4.fw",
                        [ADRENO_FW_PFP] = "a530_pfp.fw",
@@ -187,7 +174,6 @@ static const struct adreno_info gpulist[] = {
        }, {
                .rev   = ADRENO_REV(5, 1, 0, ANY_ID),
                .revn = 510,
-               .name = "A510",
                .fw = {
                        [ADRENO_FW_PM4] = "a530_pm4.fw",
                        [ADRENO_FW_PFP] = "a530_pfp.fw",
@@ -202,7 +188,6 @@ static const struct adreno_info gpulist[] = {
        }, {
                .rev   = ADRENO_REV(5, 1, 2, ANY_ID),
                .revn = 512,
-               .name = "A512",
                .fw = {
                        [ADRENO_FW_PM4] = "a530_pm4.fw",
                        [ADRENO_FW_PFP] = "a530_pfp.fw",
@@ -219,7 +204,6 @@ static const struct adreno_info gpulist[] = {
        }, {
                .rev = ADRENO_REV(5, 3, 0, 2),
                .revn = 530,
-               .name = "A530",
                .fw = {
                        [ADRENO_FW_PM4] = "a530_pm4.fw",
                        [ADRENO_FW_PFP] = "a530_pfp.fw",
@@ -238,7 +222,6 @@ static const struct adreno_info gpulist[] = {
        }, {
                .rev = ADRENO_REV(5, 4, 0, ANY_ID),
                .revn = 540,
-               .name = "A540",
                .fw = {
                        [ADRENO_FW_PM4] = "a530_pm4.fw",
                        [ADRENO_FW_PFP] = "a530_pfp.fw",
@@ -256,7 +239,6 @@ static const struct adreno_info gpulist[] = {
        }, {
                .rev = ADRENO_REV(6, 1, 0, ANY_ID),
                .revn = 610,
-               .name = "A610",
                .fw = {
                        [ADRENO_FW_SQE] = "a630_sqe.fw",
                },
@@ -268,7 +250,6 @@ static const struct adreno_info gpulist[] = {
        }, {
                .rev = ADRENO_REV(6, 1, 8, ANY_ID),
                .revn = 618,
-               .name = "A618",
                .fw = {
                        [ADRENO_FW_SQE] = "a630_sqe.fw",
                        [ADRENO_FW_GMU] = "a630_gmu.bin",
@@ -279,7 +260,6 @@ static const struct adreno_info gpulist[] = {
        }, {
                .rev = ADRENO_REV(6, 1, 9, ANY_ID),
                .revn = 619,
-               .name = "A619",
                .fw = {
                        [ADRENO_FW_SQE] = "a630_sqe.fw",
                        [ADRENO_FW_GMU] = "a619_gmu.bin",
@@ -292,7 +272,6 @@ static const struct adreno_info gpulist[] = {
        }, {
                .rev = ADRENO_REV(6, 3, 0, ANY_ID),
                .revn = 630,
-               .name = "A630",
                .fw = {
                        [ADRENO_FW_SQE] = "a630_sqe.fw",
                        [ADRENO_FW_GMU] = "a630_gmu.bin",
@@ -305,7 +284,6 @@ static const struct adreno_info gpulist[] = {
        }, {
                .rev = ADRENO_REV(6, 4, 0, ANY_ID),
                .revn = 640,
-               .name = "A640",
                .fw = {
                        [ADRENO_FW_SQE] = "a630_sqe.fw",
                        [ADRENO_FW_GMU] = "a640_gmu.bin",
@@ -318,7 +296,6 @@ static const struct adreno_info gpulist[] = {
        }, {
                .rev = ADRENO_REV(6, 5, 0, ANY_ID),
                .revn = 650,
-               .name = "A650",
                .fw = {
                        [ADRENO_FW_SQE] = "a650_sqe.fw",
                        [ADRENO_FW_GMU] = "a650_gmu.bin",
@@ -332,7 +309,6 @@ static const struct adreno_info gpulist[] = {
        }, {
                .rev = ADRENO_REV(6, 6, 0, ANY_ID),
                .revn = 660,
-               .name = "A660",
                .fw = {
                        [ADRENO_FW_SQE] = "a660_sqe.fw",
                        [ADRENO_FW_GMU] = "a660_gmu.bin",
@@ -357,7 +333,6 @@ static const struct adreno_info gpulist[] = {
        }, {
                .rev = ADRENO_REV(6, 8, 0, ANY_ID),
                .revn = 680,
-               .name = "A680",
                .fw = {
                        [ADRENO_FW_SQE] = "a630_sqe.fw",
                        [ADRENO_FW_GMU] = "a640_gmu.bin",

diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
index 5c5901d6595073586daa4a98d724bbff527e76ff..e3cd9ff6ff1d269c5a552497fb247446ca9c6d0f 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
@@ -1105,14 +1105,11 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,
                speedbin = 0xffff;
        adreno_gpu->speedbin = (uint16_t) (0xffff & speedbin);
 
-       gpu_name = adreno_gpu->info->name;
-       if (!gpu_name) {
-               gpu_name = devm_kasprintf(dev, GFP_KERNEL, "%d.%d.%d.%d",
-                               rev->core, rev->major, rev->minor,
-                               rev->patchid);
-               if (!gpu_name)
-                       return -ENOMEM;
-       }
+       gpu_name = devm_kasprintf(dev, GFP_KERNEL, "%d.%d.%d.%d",
+                       rev->core, rev->major, rev->minor,
+                       rev->patchid);
+       if (!gpu_name)
+               return -ENOMEM;
 
        adreno_gpu_config.ioname = "kgsl_3d0_reg_memory";
 

diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
index 845019891ad19f2cd9f151d503d391c8f851021b..ac2350ebe035b9e534a6d0717bb538017d192b78 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
@@ -61,7 +61,6 @@ extern const struct adreno_reglist a660_hwcg[], a690_hwcg[];
 struct adreno_info {
        struct adreno_rev rev;
        uint32_t revn;
-       const char *name;
        const char *fw[ADRENO_FW_MAX];
        uint32_t gmem;
        u64 quirks;