diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-02-11 15:47:17 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-04-13 15:54:00 +1000 |
| commit | d6e6d327d70957df707e12f74396d440b24684d6 (patch) | |
| tree | 0cc242b6c6eff21a877b1381870a59c7d8ac6d95 /bin | |
| parent | 2871dc1e4c040211a8e9abdbbb2eba0c53b80d20 (diff) | |
| download | nouveau-d6e6d327d70957df707e12f74396d440b24684d6.tar.gz | |
bin: fix some missed search+replaces
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/nv_rvfunc.h | 6 | ||||
| -rw-r--r-- | bin/nv_wsfunc.h | 6 | ||||
| -rw-r--r-- | bin/nv_wvfunc.h | 6 |
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); |