diff options
| author | Stefan Schake <stschake@gmail.com> | 2017-12-02 18:40:39 +0100 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2017-12-08 22:02:22 +0100 |
| commit | babc8110057cb9ca542c3c1666cbda4e8ccf9250 (patch) | |
| tree | fdb52bace4d24e5ff23d99f306c933df4a84e52f /drivers/gpu/drm | |
| parent | Merge tag 'drm-misc-fixes-2017-12-07' of git://anongit.freedesktop.org/drm/dr... (diff) | |
| download | linux-babc8110057cb9ca542c3c1666cbda4e8ccf9250.tar.xz linux-babc8110057cb9ca542c3c1666cbda4e8ccf9250.zip | |
drm/vc4: Release fence after signalling
We were never releasing the initial fence reference that is obtained
through dma_fence_init.
Link: https://github.com/anholt/linux/issues/122
Fixes: cdec4d361323 ("drm/vc4: Expose dma-buf fences for V3D rendering.")
Signed-off-by: Stefan Schake <stschake@gmail.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/1512236444-301-1-git-send-email-stschake@gmail.com
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_gem.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_irq.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c index 6c32c89a83a9..638540943c61 100644 --- a/drivers/gpu/drm/vc4/vc4_gem.c +++ b/drivers/gpu/drm/vc4/vc4_gem.c @@ -888,8 +888,10 @@ vc4_complete_exec(struct drm_device *dev, struct vc4_exec_info *exec) /* If we got force-completed because of GPU reset rather than * through our IRQ handler, signal the fence now. */ - if (exec->fence) + if (exec->fence) { dma_fence_signal(exec->fence); + dma_fence_put(exec->fence); + } if (exec->bo) { for (i = 0; i < exec->bo_count; i++) { diff --git a/drivers/gpu/drm/vc4/vc4_irq.c b/drivers/gpu/drm/vc4/vc4_irq.c index 61b2e5377993..26eddbb62893 100644 --- a/drivers/gpu/drm/vc4/vc4_irq.c +++ b/drivers/gpu/drm/vc4/vc4_irq.c @@ -139,6 +139,7 @@ vc4_irq_finish_render_job(struct drm_device *dev) list_move_tail(&exec->head, &vc4->job_done_list); if (exec->fence) { dma_fence_signal_locked(exec->fence); + dma_fence_put(exec->fence); exec->fence = NULL; } vc4_submit_next_render_job(dev); |