Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da611979 authored by Dave Airlie's avatar Dave Airlie
Browse files

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
parents 4b5587c8 fe4600a5

drivers/gpu/drm/drm_gem.c

+3 −3
Original line number Diff line number Diff line
@@ -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;