diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-08-10 04:10:21 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-08-10 04:43:28 +1000 |
| commit | b7c81f0355379b9d0fcdf624a8df1b7119f28efc (patch) | |
| tree | 21c37810cbdc088158e06ee75ee303a4af99d0f2 /bin/nv_rvfunc.h | |
| parent | c0368d5441d90c6a2ac0583d7d2144c6d6baab8c (diff) | |
| download | nouveau-b7c81f0355379b9d0fcdf624a8df1b7119f28efc.tar.gz | |
nvif: import library functions for the ioctl/event interfaces
This is a wrapper around the interfaces defined in an earlier commit,
and is also used by various userspace (either by a libdrm backend, or
libpciaccess) tools/tests.
In the future this will be extended to handle channels, replacing some
long-unloved code we currently use, and allow fifo/display/mpeg (hi
Ilia ;)) engines to all be exposed in the same way.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'bin/nv_rvfunc.h')
| -rw-r--r-- | bin/nv_rvfunc.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/bin/nv_rvfunc.h b/bin/nv_rvfunc.h index 18f43219c..590e959b2 100644 --- a/bin/nv_rvfunc.h +++ b/bin/nv_rvfunc.h @@ -1,14 +1,12 @@ #include <stdlib.h> -#include <core/os.h> -#include <core/object.h> -#include <core/device.h> +#include <nvif/device.h> static CAST -nv_rvram(struct nouveau_object *device, u64 addr) +nv_rvram(struct nvif_device *device, u64 addr) { - if (nv_device(device)->card_type >= NV_50 && - nv_device(device)->card_type <= NV_E0) { + 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)); |