drm/nouveau/fb: cosmetic changes

[mirror_ubuntu-bionic-kernel.git] / drivers / gpu / drm / nouveau / nvkm / subdev / fb / rammcp77.c

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/rammcp77.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/rammcp77.c
index abc18e89a97c7ddcfe21fc2411a5bd3b32f7cfbb..7f378788d3e512d0050c85ae356530646c6e2ab1 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/rammcp77.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/rammcp77.c
@@ -23,7 +23,7 @@
  */
 #include "nv50.h"
 
-struct mcp77_ram_priv {
+struct mcp77_ram {
        struct nvkm_ram base;
        u64 poller_base;
 };
@@ -35,58 +35,58 @@ mcp77_ram_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
 {
        u32 rsvd_head = ( 256 * 1024); /* vga memory */
        u32 rsvd_tail = (1024 * 1024); /* vbios etc */
-       struct nvkm_fb *pfb = nvkm_fb(parent);
-       struct mcp77_ram_priv *priv;
+       struct nvkm_fb *fb = nvkm_fb(parent);
+       struct mcp77_ram *ram;
        int ret;
 
-       ret = nvkm_ram_create(parent, engine, oclass, &priv);
-       *pobject = nv_object(priv);
+       ret = nvkm_ram_create(parent, engine, oclass, &ram);
+       *pobject = nv_object(fb);
        if (ret)
                return ret;
 
-       priv->base.type   = NV_MEM_TYPE_STOLEN;
-       priv->base.stolen = (u64)nv_rd32(pfb, 0x100e10) << 12;
-       priv->base.size   = (u64)nv_rd32(pfb, 0x100e14) << 12;
+       ram->base.type   = NV_MEM_TYPE_STOLEN;
+       ram->base.stolen = (u64)nv_rd32(fb, 0x100e10) << 12;
+       ram->base.size   = (u64)nv_rd32(fb, 0x100e14) << 12;
 
        rsvd_tail += 0x1000;
-       priv->poller_base = priv->base.size - rsvd_tail;
+       ram->poller_base = ram->base.size - rsvd_tail;
 
-       ret = nvkm_mm_init(&pfb->vram, rsvd_head >> 12,
-                          (priv->base.size  - (rsvd_head + rsvd_tail)) >> 12,
+       ret = nvkm_mm_init(&fb->vram, rsvd_head >> 12,
+                          (ram->base.size  - (rsvd_head + rsvd_tail)) >> 12,
                           1);
        if (ret)
                return ret;
 
-       priv->base.get = nv50_ram_get;
-       priv->base.put = nv50_ram_put;
+       ram->base.get = nv50_ram_get;
+       ram->base.put = nv50_ram_put;
        return 0;
 }
 
 static int
 mcp77_ram_init(struct nvkm_object *object)
 {
-       struct nvkm_fb *pfb = nvkm_fb(object);
-       struct mcp77_ram_priv *priv = (void *)object;
+       struct nvkm_fb *fb = nvkm_fb(object);
+       struct mcp77_ram *ram = (void *)object;
        int ret;
        u64 dniso, hostnb, flush;
 
-       ret = nvkm_ram_init(&priv->base);
+       ret = nvkm_ram_init(&ram->base);
        if (ret)
                return ret;
 
-       dniso  = ((priv->base.size - (priv->poller_base + 0x00)) >> 5) - 1;
-       hostnb = ((priv->base.size - (priv->poller_base + 0x20)) >> 5) - 1;
-       flush  = ((priv->base.size - (priv->poller_base + 0x40)) >> 5) - 1;
+       dniso  = ((ram->base.size - (ram->poller_base + 0x00)) >> 5) - 1;
+       hostnb = ((ram->base.size - (ram->poller_base + 0x20)) >> 5) - 1;
+       flush  = ((ram->base.size - (ram->poller_base + 0x40)) >> 5) - 1;
 
        /* Enable NISO poller for various clients and set their associated
         * read address, only for MCP77/78 and MCP79/7A. (fd#25701)
         */
-       nv_wr32(pfb, 0x100c18, dniso);
-       nv_mask(pfb, 0x100c14, 0x00000000, 0x00000001);
-       nv_wr32(pfb, 0x100c1c, hostnb);
-       nv_mask(pfb, 0x100c14, 0x00000000, 0x00000002);
-       nv_wr32(pfb, 0x100c24, flush);
-       nv_mask(pfb, 0x100c14, 0x00000000, 0x00010000);
+       nv_wr32(fb, 0x100c18, dniso);
+       nv_mask(fb, 0x100c14, 0x00000000, 0x00000001);
+       nv_wr32(fb, 0x100c1c, hostnb);
+       nv_mask(fb, 0x100c14, 0x00000000, 0x00000002);
+       nv_wr32(fb, 0x100c24, flush);
+       nv_mask(fb, 0x100c14, 0x00000000, 0x00010000);
        return 0;
 }