summaryrefslogtreecommitdiff
path: root/drm/nouveau/nvkm/subdev/fb/ramnv41.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-08-20 14:54:06 +1000
committerBen Skeggs <bskeggs@redhat.com>2015-08-28 12:37:27 +1000
commit9d8e8873c8c9d321e888e4750ed941a1aa2a2efe (patch)
tree743e82426076afd7de863a681d27c1f43d2f142e /drm/nouveau/nvkm/subdev/fb/ramnv41.c
parenta54164adcd6779d248c82648cf04a8d2c6a3f6f3 (diff)
downloadnouveau-9d8e8873c8c9d321e888e4750ed941a1aa2a2efe.tar.gz
fb: cosmetic changes
This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drm/nouveau/nvkm/subdev/fb/ramnv41.c')
-rw-r--r--drm/nouveau/nvkm/subdev/fb/ramnv41.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drm/nouveau/nvkm/subdev/fb/ramnv41.c b/drm/nouveau/nvkm/subdev/fb/ramnv41.c
index 33c612b13..ba0bca729 100644
--- a/drm/nouveau/nvkm/subdev/fb/ramnv41.c
+++ b/drm/nouveau/nvkm/subdev/fb/ramnv41.c
@@ -28,9 +28,9 @@ nv41_ram_create(struct nvkm_object *parent, struct nvkm_object *engine,
struct nvkm_oclass *oclass, void *data, u32 size,
struct nvkm_object **pobject)
{
- struct nvkm_fb *pfb = nvkm_fb(parent);
+ struct nvkm_fb *fb = nvkm_fb(parent);
struct nv40_ram *ram;
- u32 pfb474 = nv_rd32(pfb, 0x100474);
+ u32 fb474 = nv_rd32(fb, 0x100474);
int ret;
ret = nvkm_ram_create(parent, engine, oclass, &ram);
@@ -38,16 +38,16 @@ nv41_ram_create(struct nvkm_object *parent, struct nvkm_object *engine,
if (ret)
return ret;
- if (pfb474 & 0x00000004)
+ if (fb474 & 0x00000004)
ram->base.type = NV_MEM_TYPE_GDDR3;
- if (pfb474 & 0x00000002)
+ if (fb474 & 0x00000002)
ram->base.type = NV_MEM_TYPE_DDR2;
- if (pfb474 & 0x00000001)
+ if (fb474 & 0x00000001)
ram->base.type = NV_MEM_TYPE_DDR1;
- ram->base.size = nv_rd32(pfb, 0x10020c) & 0xff000000;
- ram->base.parts = (nv_rd32(pfb, 0x100200) & 0x00000003) + 1;
- ram->base.tags = nv_rd32(pfb, 0x100320);
+ ram->base.size = nv_rd32(fb, 0x10020c) & 0xff000000;
+ ram->base.parts = (nv_rd32(fb, 0x100200) & 0x00000003) + 1;
+ ram->base.tags = nv_rd32(fb, 0x100320);
ram->base.calc = nv40_ram_calc;
ram->base.prog = nv40_ram_prog;
ram->base.tidy = nv40_ram_tidy;