From c889937981559c11cd8a64ad13f95439c102aa2c Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Fri, 8 Jan 2010 10:53:40 +1000 Subject: [PATCH] --- yaml --- r: 179879 b: refs/heads/master c: dff36321497b1130085820c81a44779b065c8d7e h: refs/heads/master i: 179877: 22442a0f315c1105290593076f84f6269765ab88 179875: 38887086dc345b72e697f2d422793f20b1704b36 179871: d92c628e3b6cccd14eae377ea2efd90480cb6e8c v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_dma.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f7e0add56527..7184b1f0dea1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1dee7a930bfddd69825fca3e3f9541c8a5333876 +refs/heads/master: dff36321497b1130085820c81a44779b065c8d7e diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_dma.c b/trunk/drivers/gpu/drm/nouveau/nouveau_dma.c index f1fd3f2b9813..3f7f78e03d42 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_dma.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_dma.c @@ -130,7 +130,7 @@ READ_GET(struct nouveau_channel *chan, uint32_t *get) val = nvchan_rd32(chan, chan->user_get); if (val < chan->pushbuf_base || - val >= chan->pushbuf_base + chan->pushbuf_bo->bo.mem.size) { + val > chan->pushbuf_base + (chan->dma.max << 2)) { /* meaningless to dma_wait() except to know whether the * GPU has stalled or not */