diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-09-30 01:09:42 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-10-05 01:58:47 +0200 |
| commit | 62841ab726def838472dfaaee571a0d30a2ce1e0 (patch) | |
| tree | 85bf5324d0235c96f1bb65db68a79217dae305ad /drivers/gpu/drm/nouveau/nouveau_dma.c | |
| parent | drm/nv0x-nv4x: Leave the 0x40 bit untouched when changing CRE_LCD. (diff) | |
| download | linux-62841ab726def838472dfaaee571a0d30a2ce1e0.tar.xz linux-62841ab726def838472dfaaee571a0d30a2ce1e0.zip | |
drm/nv50: prevent (IB_PUT == IB_GET) for occurring unless idle
Should fix a DMA race condition I've never seen myself, but could be
the culprit in some random hangs that have been reported.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.c b/drivers/gpu/drm/nouveau/nouveau_dma.c index 9d27acda87e2..eb24e2b05193 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dma.c +++ b/drivers/gpu/drm/nouveau/nouveau_dma.c @@ -214,7 +214,7 @@ nv50_dma_push_wait(struct nouveau_channel *chan, int count) chan->dma.ib_free = get - chan->dma.ib_put; if (chan->dma.ib_free <= 0) - chan->dma.ib_free += chan->dma.ib_max + 1; + chan->dma.ib_free += chan->dma.ib_max; } return 0; |