Commit eedba1b3 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Rob Clark
Browse files

drm/msm: switch to drmm_mode_config_init() 



Switch to drmm_mode_config_init() instead of drm_mode_config_init().
Drop drm_mode_config_cleanup() calls.

Reviewed-by: default avatarRob Clark <robdclark@gmail.com>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/561654/


Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 937154e4

drivers/gpu/drm/msm/msm_drv.c

+5 −6
Original line number Diff line number Diff line
@@ -238,8 +238,6 @@ static int msm_drm_uninit(struct device *dev) 
	if (kms)

		msm_disp_snapshot_destroy(ddev);



	drm_mode_config_cleanup(ddev);



	if (kms) {

		pm_runtime_get_sync(dev);

		msm_irq_uninstall(ddev);
@@ -440,11 +438,13 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) 
	might_lock(&priv->lru.lock);

	fs_reclaim_release(GFP_KERNEL);



	drm_mode_config_init(ddev);

	ret = drmm_mode_config_init(ddev);

	if (ret)

		goto err_destroy_wq;



	ret = msm_init_vram(ddev);

	if (ret)

		goto err_cleanup_mode_config;

		goto err_destroy_wq;



	dma_set_max_seg_size(dev, UINT_MAX);
@@ -553,8 +553,7 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) 


err_deinit_vram:

	msm_deinit_vram(ddev);

err_cleanup_mode_config:

	drm_mode_config_cleanup(ddev);

err_destroy_wq:

	destroy_workqueue(priv->wq);

err_put_dev:

	drm_dev_put(ddev);