diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-12-09 22:32:09 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-12-09 22:32:09 +1100 |
| commit | 88b56c454513f5097b7806ffaa5c313881861504 (patch) | |
| tree | 7373d1791bc57b74425fab894caff5ac0cfcd090 /src/mesa | |
| parent | 897c96aacc6fbc08936eaf48955c15259e36caf7 (diff) | |
| parent | fecb3ce5860caa498f531c28db043c3c2cb845a8 (diff) | |
Merge branch 'nouveau-gallium-0.1' into darktama-gallium-0.1
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau_winsys/nouveau_dma.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_dma.c b/src/mesa/drivers/dri/nouveau_winsys/nouveau_dma.c index d7bddbcfe2..6ec390ec76 100644 --- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_dma.c +++ b/src/mesa/drivers/dri/nouveau_winsys/nouveau_dma.c @@ -137,6 +137,7 @@ nouveau_dma_kickoff(struct nouveau_channel *userchan) struct nouveau_channel_priv *chan = nouveau_channel(userchan); uint32_t put_offset; int i; + volatile int dum; if (chan->dma.cur == chan->dma.put) return; @@ -170,6 +171,7 @@ nouveau_dma_kickoff(struct nouveau_channel *userchan) #endif chan->dma.put = chan->dma.cur; NOUVEAU_DMA_BARRIER; + dum = READ_GET(chan); *chan->put = put_offset; NOUVEAU_DMA_BARRIER; } |