summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2018-08-06 15:28:56 -0700
committerAndres Gomez <[email protected]>2018-08-07 20:57:01 +0300
commited117c27e1123630952ae4a9fbe3d81ea45165fe (patch)
tree8cfb51cc850659a32a8feb7313db90df88bb10e7
parentfdbbe4c50c5e637ef38ced5ef299446bc54ecdd7 (diff)
vc4: Fix context creation when syncobjs aren't supported.
Noticed when trying to run current Mesa on rpi's downstream kernel. Fixes: b0acc3a5628c ("broadcom/vc4: Native fence fd support") (cherry picked from commit 86095e9bb1335b082554ed2ceaaa66470b24cb28)
-rw-r--r--src/gallium/drivers/vc4/vc4_fence.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gallium/drivers/vc4/vc4_fence.c b/src/gallium/drivers/vc4/vc4_fence.c
index 7071425595c..fac9df34d4f 100644
--- a/src/gallium/drivers/vc4/vc4_fence.c
+++ b/src/gallium/drivers/vc4/vc4_fence.c
@@ -142,8 +142,12 @@ vc4_fence_context_init(struct vc4_context *vc4)
/* Since we initialize the in_fence_fd to -1 (no wait necessary),
* we also need to initialize our in_syncobj as signaled.
*/
- return drmSyncobjCreate(vc4->fd, DRM_SYNCOBJ_CREATE_SIGNALED,
- &vc4->in_syncobj);
+ if (vc4->screen->has_syncobj) {
+ return drmSyncobjCreate(vc4->fd, DRM_SYNCOBJ_CREATE_SIGNALED,
+ &vc4->in_syncobj);
+ } else {
+ return 0;
+ }
}
void