drm:drm_stub: add new function drm_cleanup_in_dev
Subsystems (2)
PATCH 1/5 drm:drm_stub: add new function drm_cleanup_in_dev
Introduce a new function, drm_cleanup_in_dev, we could use it to release resources allocated by drm_fill_in_dev in the error handle code path after drm_fill_in_dev have been called.
Signed-off-by Wang YanQing <[email protected]>
--- drivers/gpu/drm/drm_stub.c | 62 ++++++++++++++++++++++++---------------------- include/drm/drmP.h | 1 + 2 files changed, 33 insertions(+), 30 deletions(-)
drivers/gpu/drm/drm_stub.c +32 -30
@@ -250,6 +250,37 @@ int drm_dropmaster_ioctl(struct drm_device *dev, void *data,return 0 ; } +void drm_cleanup_in_dev (struct drm_device *dev) +{ +struct drm_driver *driver; +struct drm_map_list *r_list, *list_temp; + + driver = dev->driver; +if (drm_core_has_MTRR (dev) &&drm_core_has_AGP (dev) && + dev->agp && dev->agp->agp_mtrr >=0 ) { +int retval; + retval =mtrr_del (dev->agp->agp_mtrr, + dev->agp->agp_info.aper_base, + dev->agp->agp_info.aper_size *1024 *1024 ); +DRM_DEBUG ("mtrr_del=%d\n" , retval); + } + +if (drm_core_has_AGP (dev) && dev->agp) { +kfree (dev->agp); + dev->agp =NULL ; + } + +list_for_each_entry_safe (r_list, list_temp, &dev->maplist, head) +drm_rmmap (dev, r_list->map); +drm_ht_remove (&dev->map_hash); + +drm_ctxbitmap_cleanup (dev); + +if (dev->driver->driver_features &DRIVER_GEM ) +drm_gem_destroy (dev); +} +EXPORT_SYMBOL (drm_cleanup_in_dev); +int drm_fill_in_dev (struct drm_device *dev,const struct pci_device_id *ent,struct drm_driver *driver)
@@ -438,52 +469,23 @@ static void drm_unplug_minor(struct drm_minor *minor)*/ void drm_put_dev (struct drm_device *dev) { -struct drm_driver *driver; -struct drm_map_list *r_list, *list_temp; -DRM_DEBUG ("\n" ); -if (!dev) {DRM_ERROR ("cleanup called no dev\n" );return ; } - driver = dev->driver;drm_lastclose (dev); -if (drm_core_has_MTRR (dev) &&drm_core_has_AGP (dev) && - dev->agp && dev->agp->agp_mtrr >=0 ) { -int retval; - retval =mtrr_del (dev->agp->agp_mtrr, - dev->agp->agp_info.aper_base, - dev->agp->agp_info.aper_size *1024 *1024 ); -DRM_DEBUG ("mtrr_del=%d\n" , retval); - } -if (dev->driver->unload) dev->driver->unload (dev); -if (drm_core_has_AGP (dev) && dev->agp) { -kfree (dev->agp); - dev->agp =NULL ; - } -drm_vblank_cleanup (dev); - -list_for_each_entry_safe (r_list, list_temp, &dev->maplist, head) -drm_rmmap (dev, r_list->map); -drm_ht_remove (&dev->map_hash); - -drm_ctxbitmap_cleanup (dev); +drm_cleanup_in_dev (dev);if (drm_core_check_feature (dev,DRIVER_MODESET ))drm_put_minor (&dev->control); - -if (driver->driver_features &DRIVER_GEM ) -drm_gem_destroy (dev); -drm_put_minor (&dev->primary); -list_del (&dev->driver_item);kfree (dev->devname);kfree (dev);
include/drm/drmP.h +1 -0
@@ -1761,6 +1761,7 @@ static __inline__ void drm_core_dropmap(struct drm_local_map *map)#include <drm/drm_mem_util.h> +extern void drm_cleanup_in_dev (struct drm_device *dev);extern int drm_fill_in_dev (struct drm_device *dev,const struct pci_device_id *ent,struct drm_driver *driver);
Signature · 1 line
1.7.12.4.dirty