diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-08-10 04:10:28 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-08-10 05:26:58 +1000 |
| commit | 7fee41368944d37a1caed9dca7fd09e63868a0c4 (patch) | |
| tree | ddaffd297799cf8f0691123c41bf88e5792d5dbe /nvif | |
| parent | a7777825fc7c8c037891f8a5bceb20471be51655 (diff) | |
| download | nouveau-7fee41368944d37a1caed9dca7fd09e63868a0c4.tar.gz | |
disp: implement nvif event sources for vblank/connector notifiers
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'nvif')
| -rw-r--r-- | nvif/class.h | 4 | ||||
| -rw-r--r-- | nvif/device.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nvif/class.h b/nvif/class.h index 15dc6a355..c9897f400 100644 --- a/nvif/class.h +++ b/nvif/class.h @@ -343,6 +343,9 @@ struct kepler_channel_gpfifo_a_v0 { * legacy display ******************************************************************************/ +#define NV04_DISP_NTFY_VBLANK 0x00 +#define NV04_DISP_NTFY_CONN 0x01 + struct nv04_disp_mthd_v0 { __u8 version; #define NV04_DISP_SCANOUTPOS 0x00 @@ -365,7 +368,6 @@ struct nv04_disp_scanoutpos_v0 { __u16 hline; }; - /******************************************************************************* * display ******************************************************************************/ diff --git a/nvif/device.h b/nvif/device.h index c208bad98..b3928765f 100644 --- a/nvif/device.h +++ b/nvif/device.h @@ -54,13 +54,11 @@ void nvif_device_ref(struct nvif_device *, struct nvif_device **); #include <engine/device.h> #include <engine/fifo.h> -#include <engine/disp.h> #include <engine/graph.h> #include <engine/software.h> #define nvkm_fifo(a) nouveau_fifo(nvkm_device(a)) #define nvkm_fifo_chan(a) ((struct nouveau_fifo_chan *)nvkm_object(a)) -#define nvkm_disp(a) nouveau_disp(nvkm_device(a)) #define nvkm_gr(a) ((struct nouveau_graph *)nouveau_engine(nvkm_object(a), NVDEV_ENGINE_GR)) #endif |