From 10548903da8a9371ed45f2a0d83a87c634771fe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Sun, 25 Aug 2013 10:01:59 +0000 Subject: [PATCH] drm: Call "gem_close_object" driver callback from drm_gem_object_release_handle() This fixes leakage of "bo_va" for Cayman and following card generations. --- sys/dev/drm2/drm_gem.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/dev/drm2/drm_gem.c b/sys/dev/drm2/drm_gem.c index 56045800fc9..5215a41a786 100644 --- a/sys/dev/drm2/drm_gem.c +++ b/sys/dev/drm2/drm_gem.c @@ -328,9 +328,17 @@ drm_gem_open(struct drm_device *dev, struct drm_file *file_priv) static int drm_gem_object_release_handle(uint32_t name, void *ptr, void *arg) { + struct drm_file *file_priv; struct drm_gem_object *obj; + struct drm_device *dev; + file_priv = arg; obj = ptr; + dev = obj->dev; + + if (dev->driver->gem_close_object) + dev->driver->gem_close_object(obj, file_priv); + drm_gem_object_handle_unreference(obj); return (0); } @@ -340,7 +348,7 @@ drm_gem_release(struct drm_device *dev, struct drm_file *file_priv) { drm_gem_names_foreach(&file_priv->object_names, - drm_gem_object_release_handle, NULL); + drm_gem_object_release_handle, file_priv); drm_gem_names_fini(&file_priv->object_names); }