summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-01-08 10:53:40 +1000
committerBen Skeggs <bskeggs@redhat.com>2010-01-11 09:06:44 +1000
commitdff36321497b1130085820c81a44779b065c8d7e (patch)
tree90c66618be3b4f57728ecb3edf6c4c777899feb8
parent1dee7a930bfddd69825fca3e3f9541c8a5333876 (diff)
downloadop-kernel-dev-dff36321497b1130085820c81a44779b065c8d7e.zip
op-kernel-dev-dff36321497b1130085820c81a44779b065c8d7e.tar.gz
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 f1fd3f2..3f7f78e 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)
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
*/
OpenPOWER on IntegriCloud