Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d53233a authored by Tejun Heo's avatar Tejun Heo Committed by Linus Torvalds
Browse files

drm: don't use idr_remove_all() 



idr_destroy() can destroy idr by itself and idr_remove_all() is being
deprecated.  Drop its usage.

* drm_ctxbitmap_cleanup() was calling idr_remove_all() but forgetting
  idr_destroy() thus leaking all buffered free idr_layers.  Replace it
  with idr_destroy().

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarDavid Airlie <airlied@linux.ie>
Cc: Inki Dae <inki.dae@samsung.com>
Cc: Joonyoung Shim <jy0922.shim@samsung.com>
Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 748689d4

drivers/gpu/drm/drm_context.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ int drm_ctxbitmap_init(struct drm_device * dev) 
void drm_ctxbitmap_cleanup(struct drm_device * dev)

{

	mutex_lock(&dev->struct_mutex);

	idr_remove_all(&dev->ctx_idr);

	idr_destroy(&dev->ctx_idr);

	mutex_unlock(&dev->struct_mutex);

}

drivers/gpu/drm/drm_crtc.c

+0 −1
Original line number Diff line number Diff line
@@ -1272,7 +1272,6 @@ void drm_mode_config_cleanup(struct drm_device *dev) 
		crtc->funcs->destroy(crtc);

	}



	idr_remove_all(&dev->mode_config.crtc_idr);

	idr_destroy(&dev->mode_config.crtc_idr);

}

EXPORT_SYMBOL(drm_mode_config_cleanup);

drivers/gpu/drm/drm_drv.c

+0 −1
Original line number Diff line number Diff line
@@ -297,7 +297,6 @@ static void __exit drm_core_exit(void) 


	unregister_chrdev(DRM_MAJOR, "drm");



	idr_remove_all(&drm_minors_idr);

	idr_destroy(&drm_minors_idr);

}

drivers/gpu/drm/drm_gem.c

+0 −2
Original line number Diff line number Diff line
@@ -561,8 +561,6 @@ drm_gem_release(struct drm_device *dev, struct drm_file *file_private) 
{

	idr_for_each(&file_private->object_idr,

		     &drm_gem_object_release_handle, file_private);



	idr_remove_all(&file_private->object_idr);

	idr_destroy(&file_private->object_idr);

}

drivers/gpu/drm/exynos/exynos_drm_ipp.c

+0 −4
Original line number Diff line number Diff line
@@ -1786,8 +1786,6 @@ static int ipp_subdrv_probe(struct drm_device *drm_dev, struct device *dev) 
			drm_iommu_detach_device(drm_dev, ippdrv->dev);



err_idr:

	idr_remove_all(&ctx->ipp_idr);

	idr_remove_all(&ctx->prop_idr);

	idr_destroy(&ctx->ipp_idr);

	idr_destroy(&ctx->prop_idr);

	return ret;
@@ -1965,8 +1963,6 @@ static int ipp_remove(struct platform_device *pdev) 
	exynos_drm_subdrv_unregister(&ctx->subdrv);



	/* remove,destroy ipp idr */

	idr_remove_all(&ctx->ipp_idr);

	idr_remove_all(&ctx->prop_idr);

	idr_destroy(&ctx->ipp_idr);

	idr_destroy(&ctx->prop_idr);