summaryrefslogtreecommitdiff
path: root/bin/nv_rvfunc.h
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-08-20 14:54:15 +1000
committerBen Skeggs <bskeggs@redhat.com>2015-08-28 12:37:37 +1000
commit33b1104b25f0e58ca56d6dd13ce917371a9115fe (patch)
tree67639b4e9c8d27aa402ae417dba802a02ee5c07f /bin/nv_rvfunc.h
parent7ecff2076fd08dcc202e468385dec56002d32292 (diff)
downloadnouveau-33b1104b25f0e58ca56d6dd13ce917371a9115fe.tar.gz
nvif: simplify and tidy library interfaces
A variety of tweaks to the NVIF library interfaces, mostly ripping out things that turned out to be not so useful. - Removed refcounting from nvif_object, callers are expected to not be stupid instead. - nvif_client is directly reachable from anything derived from nvif_object, removing the need for heuristics to locate it - _new() versions of interfaces, that allocate memory for the object they construct, have been removed. The vast majority of callers used the embedded _init() interfaces. - No longer storing constructor arguments (and the data returned from nvkm) inside nvif_object, it's more or less unused and just wastes memory. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'bin/nv_rvfunc.h')
-rw-r--r--bin/nv_rvfunc.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/nv_rvfunc.h b/bin/nv_rvfunc.h
index ffb97dff8..ea8aaf60f 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 = nvif_rd32(device, 0x001700);
- nvif_wr32(device, 0x001700, 0x00000000 | (addr >> 16));
- data = RVRAM(device, 0x700000 + (addr & 0xffffULL));
- nvif_wr32(device, 0x001700, pmem);
+ u32 pmem = nvif_rd32(&device->object, 0x001700);
+ nvif_wr32(&device->object, 0x001700, 0x00000000 | (addr >> 16));
+ data = RVRAM(&device->object, 0x700000 + (addr & 0xffffULL));
+ nvif_wr32(&device->object, 0x001700, pmem);
return data;
} else {
printk("unsupported chipset\n");