diff options
| author | David Dillow <dave@thedillows.org> | 2011-03-21 21:41:47 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-04-05 11:07:16 +1000 |
| commit | 59197c026257ab730c7fc8819a0e2b26e125a534 (patch) | |
| tree | f24e835a31a79432a2df9da11152ff7007f8d869 /drivers/gpu | |
| parent | ec64a40868469d308ad1e040c6ead2373af334dd (diff) | |
| download | op-kernel-dev-59197c026257ab730c7fc8819a0e2b26e125a534.zip op-kernel-dev-59197c026257ab730c7fc8819a0e2b26e125a534.tar.gz | |
drm/nv50-nvc0: work around an evo channel hang that some people see
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_evo.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_evo.c b/drivers/gpu/drm/nouveau/nv50_evo.c index a2cfaa6..c8e83c1 100644 --- a/drivers/gpu/drm/nouveau/nv50_evo.c +++ b/drivers/gpu/drm/nouveau/nv50_evo.c @@ -186,6 +186,7 @@ nv50_evo_channel_init(struct nouveau_channel *evo) nv_mask(dev, 0x610028, 0x00000000, 0x00010001 << id); evo->dma.max = (4096/4) - 2; + evo->dma.max &= ~7; evo->dma.put = 0; evo->dma.cur = evo->dma.put; evo->dma.free = evo->dma.max - evo->dma.cur; |
