diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:10 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:19 +1000 |
| commit | 01d64afc2e3238cf1658184427fa2563963c8708 (patch) | |
| tree | f73702e2c0ec7cb51fcdd679ecc8a2754d1309bb /drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.c | |
| parent | b8ad561e5541e6e6fe5c60ef33fec50ec211c92b (diff) | |
drm/nouveau/sw: switch to device pri macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.c index af2c1afaae55..ab3175af88fe 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.c @@ -122,18 +122,19 @@ nv50_sw_vblsem_release(struct nvkm_notify *notify) struct nv50_sw_chan *chan = container_of(notify, typeof(*chan), vblank.notify[notify->index]); struct nvkm_sw *sw = (void *)nv_object(chan)->engine; - struct nvkm_bar *bar = nvkm_bar(sw); + struct nvkm_device *device = sw->engine.subdev.device; + struct nvkm_bar *bar = device->bar; - nv_wr32(sw, 0x001704, chan->vblank.channel); - nv_wr32(sw, 0x001710, 0x80000000 | chan->vblank.ctxdma); + nvkm_wr32(device, 0x001704, chan->vblank.channel); + nvkm_wr32(device, 0x001710, 0x80000000 | chan->vblank.ctxdma); bar->flush(bar); if (nv_device(sw)->chipset == 0x50) { - nv_wr32(sw, 0x001570, chan->vblank.offset); - nv_wr32(sw, 0x001574, chan->vblank.value); + nvkm_wr32(device, 0x001570, chan->vblank.offset); + nvkm_wr32(device, 0x001574, chan->vblank.value); } else { - nv_wr32(sw, 0x060010, chan->vblank.offset); - nv_wr32(sw, 0x060014, chan->vblank.value); + nvkm_wr32(device, 0x060010, chan->vblank.offset); + nvkm_wr32(device, 0x060014, chan->vblank.value); } return NVKM_NOTIFY_DROP; |