nouveau: drop rendering on the floor rather than asserting if flush fails

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/libdrm/nouveau/nouveau_pushbuf.c b/libdrm/nouveau/nouveau_pushbuf.c
index 20d5db3d3f9bb2bae5cfc163967e7e416f78293c..d434a5fcb2e8916337386fe848d4cfd68c5ce9ac 100644 (file)
--- a/libdrm/nouveau/nouveau_pushbuf.c
+++ b/libdrm/nouveau/nouveau_pushbuf.c
@@ -297,7 +297,6 @@ restart_cal:
                        goto restart_cal;
                nvpb->cal_suffix0 = req.suffix0;
                nvpb->cal_suffix1 = req.suffix1;
-               assert(ret == 0);
                if (!nvpb->no_aper_update) {
                        nvdev->base.vm_vram_size = req.vram_available;
                        nvdev->base.vm_gart_size = req.gart_available;
@@ -317,7 +316,6 @@ restart_push:
                                      &req, sizeof(req));
                if (ret == -EAGAIN)
                        goto restart_push;
-               assert(ret == 0);
        }
 
 
@@ -340,12 +338,11 @@ restart_push:
        nvpb->nr_relocs = 0;
 
        /* Allocate space for next push buffer */
-       ret = nouveau_pushbuf_space(chan, min);
-       assert(!ret);
+       assert(!nouveau_pushbuf_space(chan, min));
 
        if (chan->flush_notify)
                chan->flush_notify(chan);
 
-       return 0;
+       return ret;
 }