diff options
| author | David S. Miller <davem@davemloft.net> | 2017-12-17 04:11:55 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-17 04:11:55 +0100 |
| commit | c30abd5e40dd863f88e26be09b6ce949145a630a (patch) | |
| tree | 5b25362084308502a336d8da26b8dc7430d7c812 /drivers/gpu/drm/vc4/vc4_gem.c | |
| parent | net: phy: broadcom: Add entry for 5395 switch PHYs (diff) | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma (diff) | |
| download | linux-c30abd5e40dd863f88e26be09b6ce949145a630a.tar.xz linux-c30abd5e40dd863f88e26be09b6ce949145a630a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three sets of overlapping changes, two in the packet scheduler
and one in the meson-gxl PHY driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/gpu/drm/vc4/vc4_gem.c')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_gem.c | 4 |
1 files changed, 3 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++) { |