From b7ed162d2912d53d03d94f9ceaebf7d96d570c04 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Wed, 4 Nov 2009 17:31:18 +1000 Subject: nouveau: turn another assertion into an error Signed-off-by: Ben Skeggs --- libdrm/nouveau/nouveau_pushbuf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libdrm/nouveau/nouveau_pushbuf.c b/libdrm/nouveau/nouveau_pushbuf.c index df43effc..90250c02 100644 --- a/libdrm/nouveau/nouveau_pushbuf.c +++ b/libdrm/nouveau/nouveau_pushbuf.c @@ -87,8 +87,12 @@ nouveau_pushbuf_emit_reloc(struct nouveau_channel *chan, void *ptr, domains |= NOUVEAU_GEM_DOMAIN_VRAM; if (flags & NOUVEAU_BO_GART) domains |= NOUVEAU_GEM_DOMAIN_GART; + + if (!(pbbo->valid_domains & domains)) { + fprintf(stderr, "no valid domains remain!\n"); + return -EINVAL; + } pbbo->valid_domains &= domains; - assert(pbbo->valid_domains); assert(flags & NOUVEAU_BO_RDWR); if (flags & NOUVEAU_BO_RD) { -- cgit v1.2.3