mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-01 09:34:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/nouveau/fuse: switch to device pri macros

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs
2015-08-20 14:54:09 +10:00
parent 6758745b28
commit 2bdb4995fd
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpu/drm/nouveau/nvkm/subdev/fuse/gf100.c
View File

@@ -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;
}

3
drivers/gpu/drm/nouveau/nvkm/subdev/fuse/gm107.c
View File

@@ -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);
}

7
drivers/gpu/drm/nouveau/nvkm/subdev/fuse/nv50.c
View File

@@ -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;
}