geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
main
Ben Skeggs 2009-11-03 13:14:32 +10:00
parent 68c2ac9640
commit 63910f8aa6
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libdrm/nouveau/nouveau_pushbuf.c
View File

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