Skip to content

Commit

Permalink
drm/nouveau: use dma.max rather than pushbuf size for checking GET va…
Browse files Browse the repository at this point in the history
…lidity

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>
  • Loading branch information
Ben Skeggs authored and Dave Airlie committed Jan 11, 2010
1 parent cc6e496 commit 400f14a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/nouveau/nouveau_dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down

0 comments on commit 400f14a

Please sign in to comment.