drm/nouveau/devinit: cosmetic changes

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / nouveau / nvkm / subdev / devinit / gm204.c

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm204.c b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm204.c
index 1076fcf0d71614e89cf279234da7412557dc17ed..3c513be9817fc322cf25d7daf7bd64bcb15cbaeb 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm204.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm204.c
@@ -28,69 +28,69 @@
 #include <subdev/bios/pmu.h>
 
 static void
-pmu_code(struct nv50_devinit_priv *priv, u32 pmu, u32 img, u32 len, bool sec)
+pmu_code(struct nv50_devinit *init, u32 pmu, u32 img, u32 len, bool sec)
 {
-       struct nvkm_bios *bios = nvkm_bios(priv);
+       struct nvkm_bios *bios = nvkm_bios(init);
        int i;
 
-       nv_wr32(priv, 0x10a180, 0x01000000 | (sec ? 0x10000000 : 0) | pmu);
+       nv_wr32(init, 0x10a180, 0x01000000 | (sec ? 0x10000000 : 0) | pmu);
        for (i = 0; i < len; i += 4) {
                if ((i & 0xff) == 0)
-                       nv_wr32(priv, 0x10a188, (pmu + i) >> 8);
-               nv_wr32(priv, 0x10a184, nv_ro32(bios, img + i));
+                       nv_wr32(init, 0x10a188, (pmu + i) >> 8);
+               nv_wr32(init, 0x10a184, nv_ro32(bios, img + i));
        }
 
        while (i & 0xff) {
-               nv_wr32(priv, 0x10a184, 0x00000000);
+               nv_wr32(init, 0x10a184, 0x00000000);
                i += 4;
        }
 }
 
 static void
-pmu_data(struct nv50_devinit_priv *priv, u32 pmu, u32 img, u32 len)
+pmu_data(struct nv50_devinit *init, u32 pmu, u32 img, u32 len)
 {
-       struct nvkm_bios *bios = nvkm_bios(priv);
+       struct nvkm_bios *bios = nvkm_bios(init);
        int i;
 
-       nv_wr32(priv, 0x10a1c0, 0x01000000 | pmu);
+       nv_wr32(init, 0x10a1c0, 0x01000000 | pmu);
        for (i = 0; i < len; i += 4)
-               nv_wr32(priv, 0x10a1c4, nv_ro32(bios, img + i));
+               nv_wr32(init, 0x10a1c4, nv_ro32(bios, img + i));
 }
 
 static u32
-pmu_args(struct nv50_devinit_priv *priv, u32 argp, u32 argi)
+pmu_args(struct nv50_devinit *init, u32 argp, u32 argi)
 {
-       nv_wr32(priv, 0x10a1c0, argp);
-       nv_wr32(priv, 0x10a1c0, nv_rd32(priv, 0x10a1c4) + argi);
-       return nv_rd32(priv, 0x10a1c4);
+       nv_wr32(init, 0x10a1c0, argp);
+       nv_wr32(init, 0x10a1c0, nv_rd32(init, 0x10a1c4) + argi);
+       return nv_rd32(init, 0x10a1c4);
 }
 
 static void
-pmu_exec(struct nv50_devinit_priv *priv, u32 init_addr)
+pmu_exec(struct nv50_devinit *init, u32 init_addr)
 {
-       nv_wr32(priv, 0x10a104, init_addr);
-       nv_wr32(priv, 0x10a10c, 0x00000000);
-       nv_wr32(priv, 0x10a100, 0x00000002);
+       nv_wr32(init, 0x10a104, init_addr);
+       nv_wr32(init, 0x10a10c, 0x00000000);
+       nv_wr32(init, 0x10a100, 0x00000002);
 }
 
 static int
-pmu_load(struct nv50_devinit_priv *priv, u8 type, bool post,
+pmu_load(struct nv50_devinit *init, u8 type, bool post,
         u32 *init_addr_pmu, u32 *args_addr_pmu)
 {
-       struct nvkm_bios *bios = nvkm_bios(priv);
+       struct nvkm_bios *bios = nvkm_bios(init);
        struct nvbios_pmuR pmu;
 
        if (!nvbios_pmuRm(bios, type, &pmu)) {
-               nv_error(priv, "VBIOS PMU fuc %02x not found\n", type);
+               nv_error(init, "VBIOS PMU fuc %02x not found\n", type);
                return -EINVAL;
        }
 
        if (!post)
                return 0;
 
-       pmu_code(priv, pmu.boot_addr_pmu, pmu.boot_addr, pmu.boot_size, false);
-       pmu_code(priv, pmu.code_addr_pmu, pmu.code_addr, pmu.code_size, true);
-       pmu_data(priv, pmu.data_addr_pmu, pmu.data_addr, pmu.data_size);
+       pmu_code(init, pmu.boot_addr_pmu, pmu.boot_addr, pmu.boot_size, false);
+       pmu_code(init, pmu.code_addr_pmu, pmu.code_addr, pmu.code_size, true);
+       pmu_data(init, pmu.data_addr_pmu, pmu.data_addr, pmu.data_size);
 
        if (init_addr_pmu) {
                *init_addr_pmu = pmu.init_addr_pmu;
@@ -98,63 +98,63 @@ pmu_load(struct nv50_devinit_priv *priv, u8 type, bool post,
                return 0;
        }
 
-       return pmu_exec(priv, pmu.init_addr_pmu), 0;
+       return pmu_exec(init, pmu.init_addr_pmu), 0;
 }
 
 static int
 gm204_devinit_post(struct nvkm_subdev *subdev, bool post)
 {
-       struct nv50_devinit_priv *priv = (void *)nvkm_devinit(subdev);
-       struct nvkm_bios *bios = nvkm_bios(priv);
+       struct nv50_devinit *init = (void *)nvkm_devinit(subdev);
+       struct nvkm_bios *bios = nvkm_bios(init);
        struct bit_entry bit_I;
-       u32 init, args;
+       u32 exec, args;
        int ret;
 
        if (bit_entry(bios, 'I', &bit_I) || bit_I.version != 1 ||
                                            bit_I.length < 0x1c) {
-               nv_error(priv, "VBIOS PMU init data not found\n");
+               nv_error(init, "VBIOS PMU init data not found\n");
                return -EINVAL;
        }
 
        /* reset PMU and load init table parser ucode */
        if (post) {
-               nv_mask(priv, 0x000200, 0x00002000, 0x00000000);
-               nv_mask(priv, 0x000200, 0x00002000, 0x00002000);
-               nv_rd32(priv, 0x000200);
-               while (nv_rd32(priv, 0x10a10c) & 0x00000006) {
+               nv_mask(init, 0x000200, 0x00002000, 0x00000000);
+               nv_mask(init, 0x000200, 0x00002000, 0x00002000);
+               nv_rd32(init, 0x000200);
+               while (nv_rd32(init, 0x10a10c) & 0x00000006) {
                }
        }
 
-       ret = pmu_load(priv, 0x04, post, &init, &args);
+       ret = pmu_load(init, 0x04, post, &exec, &args);
        if (ret)
                return ret;
 
        /* upload first chunk of init data */
        if (post) {
-               u32 pmu = pmu_args(priv, args + 0x08, 0x08);
+               u32 pmu = pmu_args(init, args + 0x08, 0x08);
                u32 img = nv_ro16(bios, bit_I.offset + 0x14);
                u32 len = nv_ro16(bios, bit_I.offset + 0x16);
-               pmu_data(priv, pmu, img, len);
+               pmu_data(init, pmu, img, len);
        }
 
        /* upload second chunk of init data */
        if (post) {
-               u32 pmu = pmu_args(priv, args + 0x08, 0x10);
+               u32 pmu = pmu_args(init, args + 0x08, 0x10);
                u32 img = nv_ro16(bios, bit_I.offset + 0x18);
                u32 len = nv_ro16(bios, bit_I.offset + 0x1a);
-               pmu_data(priv, pmu, img, len);
+               pmu_data(init, pmu, img, len);
        }
 
        /* execute init tables */
        if (post) {
-               nv_wr32(priv, 0x10a040, 0x00005000);
-               pmu_exec(priv, init);
-               while (!(nv_rd32(priv, 0x10a040) & 0x00002000)) {
+               nv_wr32(init, 0x10a040, 0x00005000);
+               pmu_exec(init, exec);
+               while (!(nv_rd32(init, 0x10a040) & 0x00002000)) {
                }
        }
 
        /* load and execute some other ucode image (bios therm?) */
-       return pmu_load(priv, 0x01, post, NULL, NULL);
+       return pmu_load(init, 0x01, post, NULL, NULL);
 }
 
 struct nvkm_oclass *