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:28:12 +1000 |
| commit | 80bc340b3dd720c5b7818e21a9a1ee36e1d7ef30 (patch) | |
| tree | 045d3cd23efc3ba26f2c7dbf954274260a397065 /drivers/gpu/drm/nouveau/nvif | |
| parent | b76f15295eadd37405cdb4855351a6ceda0bd1b1 (diff) | |
drm/nouveau/disp: implement nvif event sources for vblank/connector notifiers
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvif')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvif/class.h | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvif/device.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nvif/class.h b/drivers/gpu/drm/nouveau/nvif/class.h index 15dc6a35589e..c9897f4003a9 100644 --- a/drivers/gpu/drm/nouveau/nvif/class.h +++ b/drivers/gpu/drm/nouveau/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/drivers/gpu/drm/nouveau/nvif/device.h b/drivers/gpu/drm/nouveau/nvif/device.h index c208bad984b3..b3928765f659 100644 --- a/drivers/gpu/drm/nouveau/nvif/device.h +++ b/drivers/gpu/drm/nouveau/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 |