diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:09 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:14 +1000 |
| commit | 6758745b2821bddcec1aae0c4cffaa9608aeda59 (patch) | |
| tree | 6d5d529e12b347d0382659fe4bfced7fc9b2975f /drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv44.c | |
| parent | 8ac3f64f75b6b7dbe5917e5c65344915415f58e1 (diff) | |
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/nv44.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv44.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv44.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv44.c index d6b917f70910..9b76716982e6 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv44.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv44.c @@ -38,24 +38,26 @@ nv44_fb_tile_init(struct nvkm_fb *fb, int i, u32 addr, u32 size, u32 pitch, void nv44_fb_tile_prog(struct nvkm_fb *fb, int i, struct nvkm_fb_tile *tile) { - nv_wr32(fb, 0x100604 + (i * 0x10), tile->limit); - nv_wr32(fb, 0x100608 + (i * 0x10), tile->pitch); - nv_wr32(fb, 0x100600 + (i * 0x10), tile->addr); - nv_rd32(fb, 0x100600 + (i * 0x10)); + struct nvkm_device *device = fb->subdev.device; + nvkm_wr32(device, 0x100604 + (i * 0x10), tile->limit); + nvkm_wr32(device, 0x100608 + (i * 0x10), tile->pitch); + nvkm_wr32(device, 0x100600 + (i * 0x10), tile->addr); + nvkm_rd32(device, 0x100600 + (i * 0x10)); } int nv44_fb_init(struct nvkm_object *object) { struct nvkm_fb *fb = (void *)object; + struct nvkm_device *device = fb->subdev.device; int ret; ret = nvkm_fb_init(fb); if (ret) return ret; - nv_wr32(fb, 0x100850, 0x80000000); - nv_wr32(fb, 0x100800, 0x00000001); + nvkm_wr32(device, 0x100850, 0x80000000); + nvkm_wr32(device, 0x100800, 0x00000001); return 0; } |