diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2013-02-14 09:28:37 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-02-20 16:00:51 +1000 |
| commit | a34caf78f26bda63869471cb3f46f354f4658758 (patch) | |
| tree | dc9b1ce9d37ea3d2f0c6a34f7e4c90cc5be3a8f0 /drivers/gpu/drm/nouveau/nouveau_fence.h | |
| parent | fa531bc8b4278010fd11819c089f6679890addee (diff) | |
| download | talos-obmc-linux-a34caf78f26bda63869471cb3f46f354f4658758.tar.gz talos-obmc-linux-a34caf78f26bda63869471cb3f46f354f4658758.zip | |
drm/nv84/fence: access fences with full virtual address, not offset
Allows most of the code to be shared between nv84/nvc0 implementations,
and paves the way for doing emit/sync on non-VRAM buffers (multi-gpu,
dma-buf).
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_fence.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fence.h | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.h b/drivers/gpu/drm/nouveau/nouveau_fence.h index be6166eb966d..2324911fc4c3 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fence.h +++ b/drivers/gpu/drm/nouveau/nouveau_fence.h @@ -68,8 +68,27 @@ void nv17_fence_resume(struct nouveau_drm *drm); int nv50_fence_create(struct nouveau_drm *); int nv84_fence_create(struct nouveau_drm *); int nvc0_fence_create(struct nouveau_drm *); -u64 nvc0_fence_crtc(struct nouveau_channel *, int crtc); int nouveau_flip_complete(void *chan); +struct nv84_fence_chan { + struct nouveau_fence_chan base; + struct nouveau_vma vma; + struct nouveau_vma dispc_vma[4]; +}; + +struct nv84_fence_priv { + struct nouveau_fence_priv base; + struct nouveau_bo *bo; + u32 *suspend; +}; + +u64 nv84_fence_crtc(struct nouveau_channel *, int); +u32 nv84_fence_read(struct nouveau_channel *); +int nv84_fence_context_new(struct nouveau_channel *); +void nv84_fence_context_del(struct nouveau_channel *); +bool nv84_fence_suspend(struct nouveau_drm *); +void nv84_fence_resume(struct nouveau_drm *); +void nv84_fence_destroy(struct nouveau_drm *); + #endif |
