nv50: support non-blocking query_result()

2009-07-29 11:19:52 +10:00
parent 625bc0cfa2
commit 693f900b16
1 changed files with 5 additions and 5 deletions
@@ -107,13 +107,13 @@ nv50_query_result(struct pipe_context *pipe, struct pipe_query *pq,
 		  boolean wait, uint64_t *result)
 {
 	struct nv50_query *q = nv50_query(pq);
-
-	/*XXX: Want to be able to return FALSE here instead of blocking
-	 *     until the result is available..
-	 */
+	int ret;

 	if (!q->ready) {
-		nouveau_bo_map(q->bo, NOUVEAU_BO_RD);
+		ret = nouveau_bo_map(q->bo, NOUVEAU_BO_RD |
+				     wait ? 0 : NOUVEAU_BO_NOWAIT);
+		if (ret)
+			return false;
 		q->result = ((uint32_t *)q->bo->map)[1];
 		q->ready = TRUE;
 		nouveau_bo_unmap(q->bo);