diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-06-28 17:06:58 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-06-28 17:06:58 +1000 |
| commit | 5193c08c7e82248cb6b1e5d672d261c4da6bb47b (patch) | |
| tree | 419c297a9d91661a3b27b74ec85e2fa7d8d68202 /drivers/gpu | |
| parent | c0bc126f97fb929b3ae02c1c62322645d70eb408 (diff) | |
| parent | 82fcee526ba8ca2c5d378bdf51b21b7eb058fe3a (diff) | |
| download | op-kernel-dev-5193c08c7e82248cb6b1e5d672d261c4da6bb47b.zip op-kernel-dev-5193c08c7e82248cb6b1e5d672d261c4da6bb47b.tar.gz | |
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
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 1 |
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 13db8a2..1f013d4 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); } |
