diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 07:54:09 +0300 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 05:40:14 +0300 |
| commit | 6758745b2821bddcec1aae0c4cffaa9608aeda59 (patch) | |
| tree | 6d5d529e12b347d0382659fe4bfced7fc9b2975f /drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv44.c | |
| parent | 8ac3f64f75b6b7dbe5917e5c65344915415f58e1 (diff) | |
| download | linux-6758745b2821bddcec1aae0c4cffaa9608aeda59.tar.xz | |
drm/nouveau/fb: switch to device pri macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv44.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv44.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv44.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv44.c index ef84bafad546..ac0ba6deb576 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv44.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv44.c @@ -30,7 +30,8 @@ nv44_ram_create(struct nvkm_object *parent, struct nvkm_object *engine, { struct nvkm_fb *fb = nvkm_fb(parent); struct nv40_ram *ram; - u32 fb474 = nv_rd32(fb, 0x100474); + struct nvkm_device *device = fb->subdev.device; + u32 fb474 = nvkm_rd32(device, 0x100474); int ret; ret = nvkm_ram_create(parent, engine, oclass, &ram); @@ -45,7 +46,7 @@ nv44_ram_create(struct nvkm_object *parent, struct nvkm_object *engine, if (fb474 & 0x00000001) ram->base.type = NV_MEM_TYPE_DDR1; - ram->base.size = nv_rd32(fb, 0x10020c) & 0xff000000; + ram->base.size = nvkm_rd32(device, 0x10020c) & 0xff000000; ram->base.calc = nv40_ram_calc; ram->base.prog = nv40_ram_prog; ram->base.tidy = nv40_ram_tidy; |