diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-08-10 04:10:27 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-08-10 05:26:58 +1000 |
| commit | ef953eed1f442560e7a03fe23d9c0fb79d254e6b (patch) | |
| tree | 54465073d0e669e82ef540fa81f35764f85a5f00 /nvif | |
| parent | 39e2197f793e11f18b9e67b322beebb89c104f78 (diff) | |
| download | nouveau-ef953eed1f442560e7a03fe23d9c0fb79d254e6b.tar.gz | |
disp: audit and version SCANOUTPOS method
The full object interfaces are about to be exposed to userspace, so we
need to check for any security-related issues and version the structs
to make it easier to handle any changes we may need in the future.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'nvif')
| -rw-r--r-- | nvif/class.h | 23 | ||||
| -rw-r--r-- | nvif/object.h | 1 |
2 files changed, 23 insertions, 1 deletions
diff --git a/nvif/class.h b/nvif/class.h index f869f94d4..b0998e7a5 100644 --- a/nvif/class.h +++ b/nvif/class.h @@ -294,6 +294,28 @@ struct kepler_channel_gpfifo_a_v0 { * legacy display ******************************************************************************/ +struct nv04_disp_mthd_v0 { + __u8 version; +#define NV04_DISP_SCANOUTPOS 0x00 + __u8 method; + __u8 head; + __u8 pad03[5]; +}; + +struct nv04_disp_scanoutpos_v0 { + __u8 version; + __u8 pad01[7]; + __s64 time[2]; + __u16 vblanks; + __u16 vblanke; + __u16 vtotal; + __u16 vline; + __u16 hblanks; + __u16 hblanke; + __u16 htotal; + __u16 hline; +}; + /******************************************************************************* * display @@ -303,6 +325,7 @@ struct kepler_channel_gpfifo_a_v0 { struct nv50_disp_mthd_v0 { __u8 version; +#define NV50_DISP_SCANOUTPOS 0x00 __u8 method; __u8 head; __u8 pad03[5]; diff --git a/nvif/object.h b/nvif/object.h index a5d82814a..fac3a3bbe 100644 --- a/nvif/object.h +++ b/nvif/object.h @@ -71,6 +71,5 @@ void nvif_object_unmap(struct nvif_object *); /*XXX*/ #include <core/object.h> #define nvkm_object(a) ((struct nouveau_object *)nvif_object(a)->priv) -#define nvif_exec(a,b,c,d) nv_exec(nvkm_object(a), (b), (c), (d)) #endif |