drm/nouveau/fb: cosmetic changes

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

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv20.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv20.c
index e37084b8d05e61cc21071031f481940762ef63ed..b1b50a41f161b3d5ccafb1812b1f173d5d309c28 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv20.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv20.c
@@ -26,25 +26,25 @@
 #include "nv04.h"
 
 void
-nv20_fb_tile_init(struct nvkm_fb *pfb, int i, u32 addr, u32 size, u32 pitch,
+nv20_fb_tile_init(struct nvkm_fb *fb, int i, u32 addr, u32 size, u32 pitch,
                  u32 flags, struct nvkm_fb_tile *tile)
 {
        tile->addr  = 0x00000001 | addr;
        tile->limit = max(1u, addr + size) - 1;
        tile->pitch = pitch;
        if (flags & 4) {
-               pfb->tile.comp(pfb, i, size, flags, tile);
+               fb->tile.comp(fb, i, size, flags, tile);
                tile->addr |= 2;
        }
 }
 
 static void
-nv20_fb_tile_comp(struct nvkm_fb *pfb, int i, u32 size, u32 flags,
+nv20_fb_tile_comp(struct nvkm_fb *fb, int i, u32 size, u32 flags,
                  struct nvkm_fb_tile *tile)
 {
        u32 tiles = DIV_ROUND_UP(size, 0x40);
-       u32 tags  = round_up(tiles / pfb->ram->parts, 0x40);
-       if (!nvkm_mm_head(&pfb->tags, 0, 1, tags, tags, 1, &tile->tag)) {
+       u32 tags  = round_up(tiles / fb->ram->parts, 0x40);
+       if (!nvkm_mm_head(&fb->tags, 0, 1, tags, tags, 1, &tile->tag)) {
                if (!(flags & 2)) tile->zcomp = 0x00000000; /* Z16 */
                else              tile->zcomp = 0x04000000; /* Z24S8 */
                tile->zcomp |= tile->tag->offset;
@@ -56,23 +56,23 @@ nv20_fb_tile_comp(struct nvkm_fb *pfb, int i, u32 size, u32 flags,
 }
 
 void
-nv20_fb_tile_fini(struct nvkm_fb *pfb, int i, struct nvkm_fb_tile *tile)
+nv20_fb_tile_fini(struct nvkm_fb *fb, int i, struct nvkm_fb_tile *tile)
 {
        tile->addr  = 0;
        tile->limit = 0;
        tile->pitch = 0;
        tile->zcomp = 0;
-       nvkm_mm_free(&pfb->tags, &tile->tag);
+       nvkm_mm_free(&fb->tags, &tile->tag);
 }
 
 void
-nv20_fb_tile_prog(struct nvkm_fb *pfb, int i, struct nvkm_fb_tile *tile)
+nv20_fb_tile_prog(struct nvkm_fb *fb, int i, struct nvkm_fb_tile *tile)
 {
-       nv_wr32(pfb, 0x100244 + (i * 0x10), tile->limit);
-       nv_wr32(pfb, 0x100248 + (i * 0x10), tile->pitch);
-       nv_wr32(pfb, 0x100240 + (i * 0x10), tile->addr);
-       nv_rd32(pfb, 0x100240 + (i * 0x10));
-       nv_wr32(pfb, 0x100300 + (i * 0x04), tile->zcomp);
+       nv_wr32(fb, 0x100244 + (i * 0x10), tile->limit);
+       nv_wr32(fb, 0x100248 + (i * 0x10), tile->pitch);
+       nv_wr32(fb, 0x100240 + (i * 0x10), tile->addr);
+       nv_rd32(fb, 0x100240 + (i * 0x10));
+       nv_wr32(fb, 0x100300 + (i * 0x04), tile->zcomp);
 }
 
 struct nvkm_oclass *