aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-01-07 19:53:40 -0500
committerDave Airlie <airlied@redhat.com>2010-01-10 23:41:18 -0500
commit400f14ac4ef02b2f77c9d0e3ad7d66e2f6c8e663 (patch)
tree0b8174d1a3ed384462b2d751b31ca6a0606efd4c
parentcc6e496587502057af02139931736b0b7a49f637 (diff)
drm/nouveau: use dma.max rather than pushbuf size for checking GET validity
Some upcoming G80 DMA changes will depend on this, but it's split out for bisectibility just in case it causes some unexpected issues. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_dma.c2
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 f1fd3f2b9813..3f7f78e03d42 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dma.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dma.c
@@ -130,7 +130,7 @@ READ_GET(struct nouveau_channel *chan, uint32_t *get)
130 130
131 val = nvchan_rd32(chan, chan->user_get); 131 val = nvchan_rd32(chan, chan->user_get);
132 if (val < chan->pushbuf_base || 132 if (val < chan->pushbuf_base ||
133 val >= chan->pushbuf_base + chan->pushbuf_bo->bo.mem.size) { 133 val > chan->pushbuf_base + (chan->dma.max << 2)) {
134 /* meaningless to dma_wait() except to know whether the 134 /* meaningless to dma_wait() except to know whether the
135 * GPU has stalled or not 135 * GPU has stalled or not
136 */ 136 */