diff options
author | Dave Airlie <airlied@redhat.com> | 2018-09-28 09:25:26 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2018-09-28 09:25:56 +1000 |
commit | adba0e5493ab21fb5098bc1654aca6826036273c (patch) | |
tree | b012945e33ef5cee42421692a6c39a2bf62f8c4f /drivers/gpu/drm/drm_syncobj.c | |
parent | 576156bb01a62c1f64b32b416593862bb34bddaa (diff) | |
parent | d6a77ba0eb92d8ffa4b05a442fc20d0a9b11c4c4 (diff) | |
download | linux-adba0e5493ab21fb5098bc1654aca6826036273c.tar.bz2 |
Merge tag 'drm-misc-fixes-2018-09-27-1' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
- Revert adding device-link to panels
- Don't leak fences in drm/syncobj
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20180927152712.GA53076@art_vandelay
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 adb3cb27d31e..759278fef35a 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -97,6 +97,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; @@ -743,6 +745,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, |