drm/nouveau/fuse: switch to device pri macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/gf100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/gf100.c
index 8f0eeb952e7aa8be9d839cc6ea0040693fbe4855..e9d432424071317700bad53c636f181833a267e9 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/gf100.c
@@ -33,16 +33,17 @@ static u32
 gf100_fuse_rd32(struct nvkm_object *object, u64 addr)
 {
        struct gf100_fuse *fuse = (void *)object;
+       struct nvkm_device *device = fuse->base.subdev.device;
        unsigned long flags;
        u32 fuse_enable, unk, val;
 
        /* racy if another part of nvkm start writing to these regs */
        spin_lock_irqsave(&fuse->fuse_enable_lock, flags);
-       fuse_enable = nv_mask(fuse, 0x22400, 0x800, 0x800);
-       unk = nv_mask(fuse, 0x21000, 0x1, 0x1);
-       val = nv_rd32(fuse, 0x21100 + addr);
-       nv_wr32(fuse, 0x21000, unk);
-       nv_wr32(fuse, 0x22400, fuse_enable);
+       fuse_enable = nvkm_mask(device, 0x22400, 0x800, 0x800);
+       unk = nvkm_mask(device, 0x21000, 0x1, 0x1);
+       val = nvkm_rd32(device, 0x21100 + addr);
+       nvkm_wr32(device, 0x21000, unk);
+       nvkm_wr32(device, 0x22400, fuse_enable);
        spin_unlock_irqrestore(&fuse->fuse_enable_lock, flags);
        return val;
 }

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/gm107.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/gm107.c
index e669b648e8fa89abfbe2938e9d8fe67d7874bf54..94594ac9990b70bd488302903b8147adc1cf61af 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/gm107.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/gm107.c
@@ -27,7 +27,8 @@ static u32
 gm107_fuse_rd32(struct nvkm_object *object, u64 addr)
 {
        struct nvkm_fuse *fuse = (void *)object;
-       return nv_rd32(fuse, 0x21100 + addr);
+       struct nvkm_device *device = fuse->subdev.device;
+       return nvkm_rd32(device, 0x21100 + addr);
 }
 
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/nv50.c
index ac9d5fd3e8d1b6f800a397ba94b1d36ba393170f..c47abfa98809ea6f525a1057ed9486ca8dce8086 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/nv50.c
@@ -33,14 +33,15 @@ static u32
 nv50_fuse_rd32(struct nvkm_object *object, u64 addr)
 {
        struct nv50_fuse *fuse = (void *)object;
+       struct nvkm_device *device = fuse->base.subdev.device;
        unsigned long flags;
        u32 fuse_enable, val;
 
        /* racy if another part of nvkm start writing to this reg */
        spin_lock_irqsave(&fuse->fuse_enable_lock, flags);
-       fuse_enable = nv_mask(fuse, 0x1084, 0x800, 0x800);
-       val = nv_rd32(fuse, 0x21000 + addr);
-       nv_wr32(fuse, 0x1084, fuse_enable);
+       fuse_enable = nvkm_mask(device, 0x1084, 0x800, 0x800);
+       val = nvkm_rd32(device, 0x21000 + addr);
+       nvkm_wr32(device, 0x1084, fuse_enable);
        spin_unlock_irqrestore(&fuse->fuse_enable_lock, flags);
        return val;
 }