Merge tag 'dm-3.5-changes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/agk...

[karo-tx-linux.git] / drivers / gpu / drm / nouveau / nouveau_gem.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index 996755a8c9a136480b5c065c715acb0f3a6b62d8..30f5423169444ec841d9af44f0d816cb3547ae17 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -709,7 +709,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
        }
 
        if (chan->dma.ib_max) {
-               ret = nouveau_dma_wait(chan, req->nr_push + 1, 6);
+               ret = nouveau_dma_wait(chan, req->nr_push + 1, 16);
                if (ret) {
                        NV_INFO(dev, "nv50cal_space: %d\n", ret);
                        goto out;