Skip to content

Commit

Permalink
Merge tag 'drm-misc-fixes-2017-08-24' of git://anongit.freedesktop.or…
Browse files Browse the repository at this point in the history
…g/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
  • Loading branch information
Dave Airlie committed Aug 24, 2017
2 parents 4b5587c + fe4600a commit da61197
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/gpu/drm/drm_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit da61197

Please sign in to comment.