Skip to content

L
linux-davinci
Commit 1f4eccfd authored by Thomas Hellstrom's avatar Thomas Hellstrom Committed by Dave Airlie
Browse files
Options

drm: remove hash tables on drm exit 

Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent fb41e54b
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
drivers/char/drm/drm_drv.c
View file @ 1f4eccfd
...@@ -161,6 +161,7 @@ int drm_lastclose(drm_device_t * dev) ...@@ -161,6 +161,7 @@ int drm_lastclose(drm_device_t * dev)
drm_ht_remove_item(&dev->magiclist, &pt->hash_item); drm_ht_remove_item(&dev->magiclist, &pt->hash_item);
drm_free(pt, sizeof(*pt), DRM_MEM_MAGIC); drm_free(pt, sizeof(*pt), DRM_MEM_MAGIC);
} }
drm_ht_remove(&dev->magiclist);
} }
/* Clear AGP information */ /* Clear AGP information */
...@@ -299,6 +300,7 @@ static void drm_cleanup(drm_device_t * dev) ...@@ -299,6 +300,7 @@ static void drm_cleanup(drm_device_t * dev)
if (dev->maplist) { if (dev->maplist) {
drm_free(dev->maplist, sizeof(*dev->maplist), DRM_MEM_MAPS); drm_free(dev->maplist, sizeof(*dev->maplist), DRM_MEM_MAPS);
dev->maplist = NULL; dev->maplist = NULL;
drm_ht_remove(&dev->map_hash);
} }
drm_ctxbitmap_cleanup(dev); drm_ctxbitmap_cleanup(dev);
......
drivers/char/drm/drm_fops.c
View file @ 1f4eccfd
...@@ -53,6 +53,8 @@ static int drm_setup(drm_device_t * dev) ...@@ -53,6 +53,8 @@ static int drm_setup(drm_device_t * dev)
return ret; return ret;
} }
dev->magicfree.next = NULL;
/* prebuild the SAREA */ /* prebuild the SAREA */
i = drm_addmap(dev, 0, SAREA_MAX, _DRM_SHM, _DRM_CONTAINS_LOCK, &map); i = drm_addmap(dev, 0, SAREA_MAX, _DRM_SHM, _DRM_CONTAINS_LOCK, &map);
if (i != 0) if (i != 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment