From: Ben Skeggs <skeggsb@beleth.(none)>
Date: Wed, 4 Nov 2009 07:31:18 +0000 (+1000)
Subject: nouveau: turn another assertion into an error
X-Git-Tag: android-x86-2.2~213
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b7ed162d2912d53d03d94f9ceaebf7d96d570c04;p=android-x86%2Fexternal-libdrm.git

nouveau: turn another assertion into an error

Signed-off-by: Ben Skeggs <skeggsb@beleth.(none)>
---

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) {