diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-05-30 15:54:15 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-05-30 15:54:15 +1000 |
| commit | 2a1720376adda5ecf8e636fbfb05339c7dad1c55 (patch) | |
| tree | cdb76abac82306516aa556d9e9ddb15571f07517 /drivers/gpu/drm/etnaviv | |
| parent | a82256bc026722800d1fdeca5521f1ba487bc2ef (diff) | |
| parent | 5ed02dbb497422bf225783f46e6eadd237d23d6b (diff) | |
| download | op-kernel-dev-2a1720376adda5ecf8e636fbfb05339c7dad1c55.zip op-kernel-dev-2a1720376adda5ecf8e636fbfb05339c7dad1c55.tar.gz | |
Backmerge tag 'v4.12-rc3' into drm-next
Linux 4.12-rc3
Daniel has requested this for some drm-intel-next work.
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 a13930e..ee7069e 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); } |
