diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-02-07 13:29:23 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-02-25 06:45:11 +1000 |
| commit | cdccc70eff1eaf3627a716374f9ebc115fc4621c (patch) | |
| tree | 744a5a9e35c5749326d3bfb85336afceb24c2b4d /drivers/gpu/drm/nouveau/nv50_display.h | |
| parent | 45c4e0aae96c6354bf5131a282a74fe38d032de3 (diff) | |
| download | talos-op-linux-cdccc70eff1eaf3627a716374f9ebc115fc4621c.tar.gz talos-op-linux-cdccc70eff1eaf3627a716374f9ebc115fc4621c.zip | |
drm/nv50-nvc0: initialise display sync channels
Also imports a couple of helper functions that'll be used to implement
page flipping in the following commits..
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_display.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_display.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.h b/drivers/gpu/drm/nouveau/nv50_display.h index 3f5a3d543598..c2da503a22aa 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.h +++ b/drivers/gpu/drm/nouveau/nv50_display.h @@ -35,10 +35,21 @@ #include "nouveau_crtc.h" #include "nv50_evo.h" +struct nv50_display_crtc { + struct nouveau_channel *sync; + struct { + struct nouveau_bo *bo; + u32 offset; + u16 value; + } sem; +}; + struct nv50_display { struct nouveau_channel *master; struct nouveau_gpuobj *ntfy; + struct nv50_display_crtc crtc[2]; + struct tasklet_struct tasklet; struct { struct dcb_entry *dcb; @@ -62,6 +73,10 @@ void nv50_display_destroy(struct drm_device *dev); int nv50_crtc_blank(struct nouveau_crtc *, bool blank); int nv50_crtc_set_clock(struct drm_device *, int head, int pclk); +int nv50_display_flip_next(struct drm_crtc *, struct drm_framebuffer *, + struct nouveau_channel *chan); +void nv50_display_flip_stop(struct drm_crtc *); + int nv50_evo_init(struct drm_device *dev); void nv50_evo_fini(struct drm_device *dev); void nv50_evo_dmaobj_init(struct nouveau_gpuobj *, u32 memtype, u64 base, |
