aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2017-06-28 17:06:58 +1000
committerDave Airlie <airlied@redhat.com>2017-06-28 17:06:58 +1000
commit5193c08c7e82248cb6b1e5d672d261c4da6bb47b (patch)
tree419c297a9d91661a3b27b74ec85e2fa7d8d68202
parentLinux 4.12-rc7 (diff)
parentdrm/vmwgfx: Free hash table allocated by cmdbuf managed res mgr (diff)
downloadlinux-dev-5193c08c7e82248cb6b1e5d672d261c4da6bb47b.tar.xz
linux-dev-5193c08c7e82248cb6b1e5d672d261c4da6bb47b.zip
Merge branch 'vmwgfx-fixes-4.12' of git://people.freedesktop.org/~thomash/linux into drm-fixes
Single vmwgfx fix * 'vmwgfx-fixes-4.12' of git://people.freedesktop.org/~thomash/linux: drm/vmwgfx: Free hash table allocated by cmdbuf managed res mgr
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c
index 13db8a2851ed..1f013d45c9e9 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c
@@ -321,6 +321,7 @@ void vmw_cmdbuf_res_man_destroy(struct vmw_cmdbuf_res_manager *man)
list_for_each_entry_safe(entry, next, &man->list, head)
vmw_cmdbuf_res_free(man, entry);
+ drm_ht_remove(&man->resources);
kfree(man);
}