From 63910f8aa624be5f2eaa78e08a318d388a22f829 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Tue, 3 Nov 2009 13:14:32 +1000 Subject: nouveau: drop rendering on the floor rather than asserting if flush fails Signed-off-by: Ben Skeggs --- libdrm/nouveau/nouveau_pushbuf.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libdrm/nouveau/nouveau_pushbuf.c b/libdrm/nouveau/nouveau_pushbuf.c index 20d5db3d..d434a5fc 100644 --- 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; } -- cgit v1.2.3