Commit 1c1b5bd4 authored by Tian Tao's avatar Tian Tao
Browse files

drm/hisilicon: Use managed mode-config init 



Using drmm_mode_config_init() sets up managed release of modesetting
resources.

v2:
Remove the unused structure member variable mode_config_initialized.

Signed-off-by: default avatarTian Tao <tiantao6@hisilicon.com>
Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/1607339778-20460-2-git-send-email-tiantao6@hisilicon.com
parent 13283a24

drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c

+3 −11
Original line number Diff line number Diff line
@@ -96,8 +96,9 @@ static int hibmc_kms_init(struct hibmc_drm_private *priv) 
	struct drm_device *dev = &priv->dev;

	int ret;



	drm_mode_config_init(dev);

	priv->mode_config_initialized = true;

	ret = drmm_mode_config_init(dev);

	if (ret)

		return ret;



	dev->mode_config.min_width = 0;

	dev->mode_config.min_height = 0;
@@ -125,14 +126,6 @@ static int hibmc_kms_init(struct hibmc_drm_private *priv) 
	return 0;

}



static void hibmc_kms_fini(struct hibmc_drm_private *priv)

{

	if (priv->mode_config_initialized) {

		drm_mode_config_cleanup(&priv->dev);

		priv->mode_config_initialized = false;

	}

}



/*

 * It can operate in one of three modes: 0, 1 or Sleep.

 */
@@ -262,7 +255,6 @@ static int hibmc_unload(struct drm_device *dev) 
	drm_atomic_helper_shutdown(dev);



	pci_disable_msi(dev->pdev);

	hibmc_kms_fini(priv);

	dev->dev_private = NULL;

	return 0;

}

drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ struct hibmc_drm_private { 
	struct drm_crtc crtc;

	struct drm_encoder encoder;

	struct hibmc_connector connector;

	bool mode_config_initialized;

};



static inline struct hibmc_connector *to_hibmc_connector(struct drm_connector *connector)