diff options
| author |   Dave Airlie <airlied@redhat.com> | 2017-05-19 10:16:06 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-05-19 10:16:06 +1000 |
| commit | 389cf7080c062eb5fae525858d2e70aea0422d89 (patch) | |
| tree | 49274a4b4b8fa9088e5ae173c3d67ae88877a59d /drivers/gpu/drm/etnaviv | |
| parent | Merge tag 'md/4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md (diff) | |
| parent | drm/etnaviv: don't put fence in case of submit failure (diff) | |
| download | linux-dev-389cf7080c062eb5fae525858d2e70aea0422d89.tar.xz linux-dev-389cf7080c062eb5fae525858d2e70aea0422d89.zip | |
Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm-fixes
one etnaviv fence leak fix.
* 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux:
drm/etnaviv: don't put fence in case of submit failure
Diffstat (limited to 'drivers/gpu/drm/etnaviv')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c index e1909429837e..de80ee1b71df 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c @@ -44,6 +44,7 @@ static struct etnaviv_gem_submit *submit_create(struct drm_device *dev, /* initially, until copy_from_user() and bo lookup succeeds: */ submit->nr_bos = 0; + submit->fence = NULL; ww_acquire_init(&submit->ticket, &reservation_ww_class); } @@ -294,7 +295,8 @@ static void submit_cleanup(struct etnaviv_gem_submit *submit) } ww_acquire_fini(&submit->ticket); - dma_fence_put(submit->fence); + if (submit->fence) + dma_fence_put(submit->fence); kfree(submit); } |