Merge branch 'vmwgfx-fixes-4.12' of git://people.freedesktop.org/~thomash/linux into drm-fixes

airlied · airlied · commit 5193c08c7e82 · 2017-06-28T17:06:58.000+10:00
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
diff --git 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);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -321,6 +321,7 @@ void vmw_cmdbuf_res_man_destroy(struct vmw_cmdbuf_res_manager *man)`
`321`	`321`	`list_for_each_entry_safe(entry, next, &man->list, head)`
`322`	`322`	`vmw_cmdbuf_res_free(man, entry);`
`323`	`323`
	`324`	`+ drm_ht_remove(&man->resources);`
`324`	`325`	`kfree(man);`
`325`	`326`	`}`
`326`	`327`