summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2023-11-21 02:32:57 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2023-11-21 02:32:57 +0000
commita575d7e1ecb28bbba739f9aa742fdd1a10d7f05f (patch)
treef918f1254e9e79a55449173841e342c408eabd32 /sys
parent265eb8323cf75e74e8f1036a23a292f5f230535b (diff)
drm/syncobj: fix DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE
From Erik Kurzinger 3bbf06efb8ed88fbafe7b10b79837b8300372f94 in linux-6.1.y/6.1.63 101c9f637efa1655f55876644d4439e552267527 in mainline linux
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/drm/drm_syncobj.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/pci/drm/drm_syncobj.c b/sys/dev/pci/drm/drm_syncobj.c
index 922fe5ddf66..9a28ae54bbe 100644
--- a/sys/dev/pci/drm/drm_syncobj.c
+++ b/sys/dev/pci/drm/drm_syncobj.c
@@ -1078,7 +1078,8 @@ static signed long drm_syncobj_array_wait_timeout(struct drm_syncobj **syncobjs,
fence = drm_syncobj_fence_get(syncobjs[i]);
if (!fence || dma_fence_chain_find_seqno(&fence, points[i])) {
dma_fence_put(fence);
- if (flags & DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT) {
+ if (flags & (DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT |
+ DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE)) {
continue;
} else {
timeout = -EINVAL;