summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_dma.h
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-02-03 15:46:14 +1000
committerBen Skeggs <bskeggs@redhat.com>2011-02-25 06:45:02 +1000
commit60f60bf1bc45bef38568244f5c4e0d0f105c5032 (patch)
tree8c636475240cdafb762254877dd4c00fa53fd41c /drivers/gpu/drm/nouveau/nouveau_dma.h
parentf13e435c59573aa0ac398210777cc0406c476593 (diff)
downloadblackbird-op-linux-60f60bf1bc45bef38568244f5c4e0d0f105c5032.tar.gz
blackbird-op-linux-60f60bf1bc45bef38568244f5c4e0d0f105c5032.zip
drm/nv50-nvc0: request and wait on notification of modeset completion
This should prevent a number of races from occuring, the most obvious of which will be exposed when we start making use of the "display sync" evo channel for page flipping. The DS channel will reject any command stream that doesn't completely agree with the current "master" state. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_dma.h')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_dma.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.h b/drivers/gpu/drm/nouveau/nouveau_dma.h
index c36f1763feaa..6c9501b3226b 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dma.h
+++ b/drivers/gpu/drm/nouveau/nouveau_dma.h
@@ -78,7 +78,8 @@ enum {
NvEvoVRAM = 0x01000000,
NvEvoFB16 = 0x01000001,
NvEvoFB32 = 0x01000002,
- NvEvoVRAM_LP = 0x01000003
+ NvEvoVRAM_LP = 0x01000003,
+ NvEvoSync = 0xcafe0000
};
#define NV_MEMORY_TO_MEMORY_FORMAT 0x00000039
OpenPOWER on IntegriCloud