diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:08 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:14 +1000 |
| commit | 9155c16214631e064d0d1edcd60a62347f823c80 (patch) | |
| tree | 7116ddee07bee5122ea57a43f63986d80b85b195 | |
| parent | 94bab102233e30d08fcb33a424ec56520b22eb1b (diff) | |
| download | linux-9155c16214631e064d0d1edcd60a62347f823c80.tar.bz2 | |
drm/nouveau/bar: switch to device pri macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c | 9 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c | 23 |
2 files changed, 18 insertions, 14 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c index 5f091d2c560b..09e36b64d889 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c @@ -190,18 +190,19 @@ int gf100_bar_init(struct nvkm_object *object) { struct gf100_bar *bar = (void *)object; + struct nvkm_device *device = bar->base.subdev.device; int ret; ret = nvkm_bar_init(&bar->base); if (ret) return ret; - nv_mask(bar, 0x000200, 0x00000100, 0x00000000); - nv_mask(bar, 0x000200, 0x00000100, 0x00000100); + nvkm_mask(device, 0x000200, 0x00000100, 0x00000000); + nvkm_mask(device, 0x000200, 0x00000100, 0x00000100); - nv_wr32(bar, 0x001704, 0x80000000 | bar->bar[1].mem->addr >> 12); + nvkm_wr32(device, 0x001704, 0x80000000 | bar->bar[1].mem->addr >> 12); if (bar->bar[0].mem) - nv_wr32(bar, 0x001714, + nvkm_wr32(device, 0x001714, 0xc0000000 | bar->bar[0].mem->addr >> 12); return 0; } diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c index 07f6b2a7d3c4..dcfb11895a61 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c @@ -81,9 +81,10 @@ static void nv50_bar_flush(struct nvkm_bar *obj) { struct nv50_bar *bar = container_of(obj, typeof(*bar), base); + struct nvkm_device *device = bar->base.subdev.device; unsigned long flags; spin_lock_irqsave(&bar->lock, flags); - nv_wr32(bar, 0x00330c, 0x00000001); + nvkm_wr32(device, 0x00330c, 0x00000001); if (!nv_wait(bar, 0x00330c, 0x00000002, 0x00000000)) nv_warn(bar, "flush timeout\n"); spin_unlock_irqrestore(&bar->lock, flags); @@ -93,9 +94,10 @@ void g84_bar_flush(struct nvkm_bar *obj) { struct nv50_bar *bar = container_of(obj, typeof(*bar), base); + struct nvkm_device *device = bar->base.subdev.device; unsigned long flags; spin_lock_irqsave(&bar->lock, flags); - nv_wr32(bar, 0x070000, 0x00000001); + nvkm_wr32(device, 0x070000, 0x00000001); if (!nv_wait(bar, 0x070000, 0x00000002, 0x00000000)) nv_warn(bar, "flush timeout\n"); spin_unlock_irqrestore(&bar->lock, flags); @@ -228,26 +230,27 @@ static int nv50_bar_init(struct nvkm_object *object) { struct nv50_bar *bar = (void *)object; + struct nvkm_device *device = bar->base.subdev.device; int ret, i; ret = nvkm_bar_init(&bar->base); if (ret) return ret; - nv_mask(bar, 0x000200, 0x00000100, 0x00000000); - nv_mask(bar, 0x000200, 0x00000100, 0x00000100); - nv_wr32(bar, 0x100c80, 0x00060001); + nvkm_mask(device, 0x000200, 0x00000100, 0x00000000); + nvkm_mask(device, 0x000200, 0x00000100, 0x00000100); + nvkm_wr32(device, 0x100c80, 0x00060001); if (!nv_wait(bar, 0x100c80, 0x00000001, 0x00000000)) { nv_error(bar, "vm flush timeout\n"); return -EBUSY; } - nv_wr32(bar, 0x001704, 0x00000000 | bar->mem->addr >> 12); - nv_wr32(bar, 0x001704, 0x40000000 | bar->mem->addr >> 12); - nv_wr32(bar, 0x001708, 0x80000000 | bar->bar1->node->offset >> 4); - nv_wr32(bar, 0x00170c, 0x80000000 | bar->bar3->node->offset >> 4); + nvkm_wr32(device, 0x001704, 0x00000000 | bar->mem->addr >> 12); + nvkm_wr32(device, 0x001704, 0x40000000 | bar->mem->addr >> 12); + nvkm_wr32(device, 0x001708, 0x80000000 | bar->bar1->node->offset >> 4); + nvkm_wr32(device, 0x00170c, 0x80000000 | bar->bar3->node->offset >> 4); for (i = 0; i < 8; i++) - nv_wr32(bar, 0x001900 + (i * 4), 0x00000000); + nvkm_wr32(device, 0x001900 + (i * 4), 0x00000000); return 0; } |