diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-01-12 12:33:37 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-19 14:23:01 +1000 |
| commit | d339db83b993c89c77c6ab85a6139e4bcd330c77 (patch) | |
| tree | f982e0511df99a4a1e7850d2daf5f251f4e2afa1 /bin | |
| parent | 97a7810f7a23e4105db7222e7f4a5cdccc58237a (diff) | |
| download | nouveau-d339db83b993c89c77c6ab85a6139e4bcd330c77.tar.gz | |
nvif: namespace of nvkm accessors (no binary change)
NVKM is having it's namespace switched to nvkm_, which will conflict
with these functions (which are workarounds for the fact that as of
yet, we still aren't able to split DRM and NVKM completely).
A comparison of objdump disassemblies proves no code changes.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/nv_aux.c | 2 | ||||
| -rw-r--r-- | bin/nv_i2c.c | 2 | ||||
| -rw-r--r-- | bin/nv_rffunc.h | 2 | ||||
| -rw-r--r-- | bin/nv_rifunc.h | 2 | ||||
| -rw-r--r-- | bin/nv_wffunc.h | 2 | ||||
| -rw-r--r-- | bin/nv_wifunc.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/bin/nv_aux.c b/bin/nv_aux.c index e52173a4f..3bc11e5ff 100644 --- a/bin/nv_aux.c +++ b/bin/nv_aux.c @@ -81,7 +81,7 @@ main(int argc, char **argv) if (ret) return ret; - i2c = nvkm_i2c(device); + i2c = nvxx_i2c(device); if (action < 0) { list_for_each_entry(chan, &i2c->ports, head) { diff --git a/bin/nv_i2c.c b/bin/nv_i2c.c index de0cb99d7..e7fa4cd10 100644 --- a/bin/nv_i2c.c +++ b/bin/nv_i2c.c @@ -87,7 +87,7 @@ main(int argc, char **argv) if (ret) return ret; - i2c = nvkm_i2c(device); + i2c = nvxx_i2c(device); if (action < 0) { list_for_each_entry(port, &i2c->ports, head) { diff --git a/bin/nv_rffunc.h b/bin/nv_rffunc.h index caf973dc3..350059b84 100644 --- a/bin/nv_rffunc.h +++ b/bin/nv_rffunc.h @@ -21,7 +21,7 @@ nv_rfb(struct nvif_device *device, u64 offset) if (map) iounmap(map); - map = ioremap(pci_resource_start(nvkm_device(device)->pdev, 1) + + map = ioremap(pci_resource_start(nvxx_device(device)->pdev, 1) + page, PAGE_SIZE); if (!map) { printk("map failed\n"); diff --git a/bin/nv_rifunc.h b/bin/nv_rifunc.h index be9578ca8..b1ffcfb6d 100644 --- a/bin/nv_rifunc.h +++ b/bin/nv_rifunc.h @@ -8,7 +8,7 @@ static u64 map_page = ~0ULL; static CAST nv_rfb(struct nvif_device *device, u64 offset) { - struct pci_dev *pdev = nvkm_device(device)->pdev; + struct pci_dev *pdev = nvxx_device(device)->pdev; u64 page = (offset & ~(PAGE_SIZE - 1)); u64 addr = (offset & (PAGE_SIZE - 1)); diff --git a/bin/nv_wffunc.h b/bin/nv_wffunc.h index fde5bc027..dcb8fe50d 100644 --- a/bin/nv_wffunc.h +++ b/bin/nv_wffunc.h @@ -21,7 +21,7 @@ nv_wfb(struct nvif_device *device, u64 offset, CAST data) if (map) iounmap(map); - map = ioremap(pci_resource_start(nvkm_device(device)->pdev, 1) + + map = ioremap(pci_resource_start(nvxx_device(device)->pdev, 1) + page, PAGE_SIZE); if (!map) { printk("map failed\n"); diff --git a/bin/nv_wifunc.h b/bin/nv_wifunc.h index 19df090d8..eea6a23de 100644 --- a/bin/nv_wifunc.h +++ b/bin/nv_wifunc.h @@ -8,7 +8,7 @@ static u64 map_page = ~0ULL; static void nv_wfb(struct nvif_device *device, u64 offset, CAST data) { - struct pci_dev *pdev = nvkm_device(device)->pdev; + struct pci_dev *pdev = nvxx_device(device)->pdev; u64 page = (offset & ~(PAGE_SIZE - 1)); u64 addr = (offset & (PAGE_SIZE - 1)); |