diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-08-25 09:29:38 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-08-25 09:29:38 +1000 |
| commit | da6119797705c2270f17b287660a1e7bd782a1eb (patch) | |
| tree | 178d28b30968be5bf4ab57b7ec0b8f4cbc8852ed | |
| parent | 4b5587c8c38754a5204e9bfd72900bd91e6b3610 (diff) | |
| parent | fe4600a548f2763dec91b3b27a1245c370ceee2a (diff) | |
| download | linux-da6119797705c2270f17b287660a1e7bd782a1eb.tar.gz | |
Merge tag 'drm-misc-fixes-2017-08-24' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes
Core Changes: - Release driver tracking before making the object available again (Chris) Cc: Chris Wilson <chris@chris-wilson.co.uk> * tag 'drm-misc-fixes-2017-08-24' of git://anongit.freedesktop.org/git/drm-misc: drm: Release driver tracking before making the object available again
| -rw-r--r-- | drivers/gpu/drm/drm_gem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 8dc11064253d..cdaac37907b1 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -255,13 +255,13 @@ drm_gem_object_release_handle(int id, void *ptr, void *data) struct drm_gem_object *obj = ptr; struct drm_device *dev = obj->dev; + if (dev->driver->gem_close_object) + dev->driver->gem_close_object(obj, file_priv); + if (drm_core_check_feature(dev, DRIVER_PRIME)) drm_gem_remove_prime_handles(obj, file_priv); drm_vma_node_revoke(&obj->vma_node, file_priv); - if (dev->driver->gem_close_object) - dev->driver->gem_close_object(obj, file_priv); - drm_gem_object_handle_put_unlocked(obj); return 0; |