diff options
| author | Eric Anholt <eric@anholt.net> | 2015-05-29 17:21:15 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2015-05-29 18:15:00 -0700 |
| commit | c821ccf0e3a051e5e867792898ae9b8f08e4601a (patch) | |
| tree | 9dd58a25b73cae4f60d37e06000072b90f51caa0 /src/gallium/drivers/vc4/vc4_bufmgr.c | |
| parent | fcc79af9e25d5770b8de1f4102901cbf97857a34 (diff) | |
vc4: Fix return value handling for BO waits.
If the wait ever returned -ETIME, we'd abort because the errno was
stored in errno and not drmIoctl()'s return value.
Diffstat (limited to 'src/gallium/drivers/vc4/vc4_bufmgr.c')
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_bufmgr.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/src/gallium/drivers/vc4/vc4_bufmgr.c b/src/gallium/drivers/vc4/vc4_bufmgr.c index 6b3a8c3070c..8f9d9c3ff77 100644 --- a/src/gallium/drivers/vc4/vc4_bufmgr.c +++ b/src/gallium/drivers/vc4/vc4_bufmgr.c @@ -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 * |