OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cc6e496
)
drm/nouveau: use dma.max rather than pushbuf size for checking GET validity
author
Ben Skeggs
<bskeggs@redhat.com>
Fri, 8 Jan 2010 00:53:40 +0000
(10:53 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Mon, 11 Jan 2010 04:41:18 +0000
(14:41 +1000)
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>
drivers/gpu/drm/nouveau/nouveau_dma.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nouveau_dma.c
b/drivers/gpu/drm/nouveau/nouveau_dma.c
index
f1fd3f2
..
3f7f78e
100644
(file)
--- 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
*/