summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rw-r--r--bin/nv_rvfunc.h6
-rw-r--r--bin/nv_wsfunc.h6
-rw-r--r--bin/nv_wvfunc.h6
3 files changed, 9 insertions, 9 deletions
diff --git a/bin/nv_rvfunc.h b/bin/nv_rvfunc.h
index 7ab2db9a7..cb63f374f 100644
--- a/bin/nv_rvfunc.h
+++ b/bin/nv_rvfunc.h
@@ -8,10 +8,10 @@ nv_rvram(struct nvif_device *device, u64 addr)
if (device->info.family >= NV_DEVICE_INFO_V0_TESLA &&
device->info.family <= NV_DEVICE_INFO_V0_MAXWELL) {
CAST data;
- u32 pmem = nv_ro32(device, 0x001700);
- nv_wo32(device, 0x001700, 0x00000000 | (addr >> 16));
+ u32 pmem = nvif_rd32(device, 0x001700);
+ nvif_wr32(device, 0x001700, 0x00000000 | (addr >> 16));
data = RVRAM(device, 0x700000 + (addr & 0xffffULL));
- nv_wo32(device, 0x001700, pmem);
+ nvif_wr32(device, 0x001700, pmem);
return data;
} else {
printk("unsupported chipset\n");
diff --git a/bin/nv_wsfunc.h b/bin/nv_wsfunc.h
index 9472fc9b1..85b2d2500 100644
--- a/bin/nv_wsfunc.h
+++ b/bin/nv_wsfunc.h
@@ -7,10 +7,10 @@ nv_wsys(struct nvif_device *device, u64 addr, CAST data)
{
if (device->info.family >= NV_DEVICE_INFO_V0_TESLA &&
device->info.family <= NV_DEVICE_INFO_V0_MAXWELL) {
- u32 pmem = nv_ro32(device, 0x001700);
- nv_wo32(device, 0x001700, 0x02000000 | (addr >> 16));
+ u32 pmem = nvif_rd32(device, 0x001700);
+ nvif_wr32(device, 0x001700, 0x02000000 | (addr >> 16));
WSYS(device, 0x700000 + (addr & 0xffffULL), data);
- nv_wo32(device, 0x001700, pmem);
+ nvif_wr32(device, 0x001700, pmem);
} else {
printk("unsupported chipset\n");
exit(1);
diff --git a/bin/nv_wvfunc.h b/bin/nv_wvfunc.h
index 668278ace..c11de8bed 100644
--- a/bin/nv_wvfunc.h
+++ b/bin/nv_wvfunc.h
@@ -7,10 +7,10 @@ nv_wvram(struct nvif_device *device, u64 addr, CAST data)
{
if (device->info.family >= NV_DEVICE_INFO_V0_TESLA &&
device->info.family <= NV_DEVICE_INFO_V0_MAXWELL) {
- u32 pmem = nv_ro32(device, 0x001700);
- nv_wo32(device, 0x001700, 0x00000000 | (addr >> 16));
+ u32 pmem = nvif_rd32(device, 0x001700);
+ nvif_wr32(device, 0x001700, 0x00000000 | (addr >> 16));
WVRAM(device, 0x700000 + (addr & 0xffffULL), data);
- nv_wo32(device, 0x001700, pmem);
+ nvif_wr32(device, 0x001700, pmem);
} else {
printk("unsupported chipset\n");
exit(1);