Commit 389cf708 authored by Dave Airlie's avatar Dave Airlie

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
parents 8b4822de 657314b7
...@@ -44,6 +44,7 @@ static struct etnaviv_gem_submit *submit_create(struct drm_device *dev, ...@@ -44,6 +44,7 @@ static struct etnaviv_gem_submit *submit_create(struct drm_device *dev,
/* initially, until copy_from_user() and bo lookup succeeds: */ /* initially, until copy_from_user() and bo lookup succeeds: */
submit->nr_bos = 0; submit->nr_bos = 0;
submit->fence = NULL;
ww_acquire_init(&submit->ticket, &reservation_ww_class); ww_acquire_init(&submit->ticket, &reservation_ww_class);
} }
...@@ -294,6 +295,7 @@ static void submit_cleanup(struct etnaviv_gem_submit *submit) ...@@ -294,6 +295,7 @@ static void submit_cleanup(struct etnaviv_gem_submit *submit)
} }
ww_acquire_fini(&submit->ticket); ww_acquire_fini(&submit->ticket);
if (submit->fence)
dma_fence_put(submit->fence); dma_fence_put(submit->fence);
kfree(submit); kfree(submit);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment