diff --git a/.pick_status.json b/.pick_status.json index 1e95aa0fb03..67f0bb164cc 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2874,7 +2874,7 @@ "description": "iris: Fix return of iris_wait_syncobj()", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/iris/iris_fence.c b/src/gallium/drivers/iris/iris_fence.c index da4cfd09fa4..12d1e2fcd62 100644 --- a/src/gallium/drivers/iris/iris_fence.c +++ b/src/gallium/drivers/iris/iris_fence.c @@ -155,7 +155,7 @@ clear_stale_syncobjs(struct iris_batch *batch) struct iris_batch_fence, i); assert(fence->flags & IRIS_BATCH_FENCE_WAIT); - if (iris_wait_syncobj(bufmgr, *syncobj, 0)) + if (iris_wait_syncobj(bufmgr, *syncobj, 0) == false) continue; /* This sync object has already passed, there's no need to continue @@ -225,7 +225,7 @@ iris_wait_syncobj(struct iris_bufmgr *bufmgr, .count_handles = 1, .timeout_nsec = timeout_nsec, }; - return intel_ioctl(fd, DRM_IOCTL_SYNCOBJ_WAIT, &args); + return intel_ioctl(fd, DRM_IOCTL_SYNCOBJ_WAIT, &args) == 0; } #define CSI "\e["