diff options
author | Dave Airlie | 2018-10-04 03:03:34 +0200 |
---|---|---|
committer | Dave Airlie | 2018-10-04 03:03:34 +0200 |
commit | 6004f172b375f5747e89afc62ad3baaf1bebd58a (patch) | |
tree | 914fafcc0e373c45c6e0dcc3661dad3a8be5f3d1 /drivers/gpu/drm/drm_syncobj.c | |
parent | Merge tag 'exynos-drm-next-for-v4.20' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
parent | Linux 4.19-rc6 (diff) | |
download | kernel-qcow2-linux-6004f172b375f5747e89afc62ad3baaf1bebd58a.tar.gz kernel-qcow2-linux-6004f172b375f5747e89afc62ad3baaf1bebd58a.tar.xz kernel-qcow2-linux-6004f172b375f5747e89afc62ad3baaf1bebd58a.zip |
BackMerge v4.19-rc6 into drm-next
I have some pulls based on rc6, and I prefer to have an explicit backmerge.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_syncobj.c')
-rw-r--r-- | drivers/gpu/drm/drm_syncobj.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c index 5bcb3ef9b256..5c2091dbd230 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -113,6 +113,8 @@ static int drm_syncobj_fence_get_or_add_callback(struct drm_syncobj *syncobj, { int ret; + WARN_ON(*fence); + *fence = drm_syncobj_fence_get(syncobj); if (*fence) return 1; @@ -717,6 +719,9 @@ static signed long drm_syncobj_array_wait_timeout(struct drm_syncobj **syncobjs, if (flags & DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT) { for (i = 0; i < count; ++i) { + if (entries[i].fence) + continue; + drm_syncobj_fence_get_or_add_callback(syncobjs[i], &entries[i].fence, &entries[i].syncobj_cb, |