AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vc4: Fix return value handling for BO waits.

Browse Source 
If the wait ever returned -ETIME, we'd abort because the errno was
stored in errno and not drmIoctl()'s return value.
This commit is contained in:
Eric Anholt
2015-05-29 17:21:15 -07:00
parent fcc79af9e2
commit c821ccf0e3
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/vc4/vc4_bufmgr.c
+15 -12
View File
@@ -343,15 +343,17 @@ vc4_wait_seqno(struct vc4_screen *screen, uint64_t seqno, uint64_t timeout_ns)
ret = 0;
}
if (ret == -ETIME) {
return false;
} else if (ret != 0) {
fprintf(stderr, "wait failed\n");
abort();
} else {
if (ret == 0) {
screen->finished_seqno = wait.seqno;
return true;
}
if (errno != ETIME) {
fprintf(stderr, "wait failed: %d\n", ret);
abort();
}
return false;
}
bool
@@ -370,14 +372,15 @@ vc4_bo_wait(struct vc4_bo *bo, uint64_t timeout_ns)
else
ret = 0;
if (ret == -ETIME) {
return false;
} else if (ret != 0) {
fprintf(stderr, "wait failed\n");
abort();
} else {
if (ret == 0)
return true;
if (errno != ETIME) {
fprintf(stderr, "wait failed: %d\n", ret);
abort();
}
return false;
}
void *