Commit be8c8403 authored by Tian Tao's avatar Tian Tao Committed by Thomas Zimmermann
Browse files

drm/hisilicon: Code refactoring for hibmc_drv_vdac 



code refactoring for hibmc_drv_vdac.c, no actual function changes.

v2:
remove the debug message.

v3:
embedding connector and encoder in struct hibmc_drm_private.

Signed-off-by: default avatarTian Tao <tiantao6@hisilicon.com>
Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/1593680081-60313-1-git-send-email-tiantao6@hisilicon.com
parent bc84ee94

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

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ struct hibmc_drm_private { 


	/* drm */

	struct drm_device  *dev;

	struct drm_encoder encoder;

	struct drm_connector connector;

	bool mode_config_initialized;

};

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

+11 −41
Original line number Diff line number Diff line
@@ -52,32 +52,6 @@ static const struct drm_connector_funcs hibmc_connector_funcs = { 
	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

};



static struct drm_connector *

hibmc_connector_init(struct hibmc_drm_private *priv)

{

	struct drm_device *dev = priv->dev;

	struct drm_connector *connector;

	int ret;



	connector = devm_kzalloc(dev->dev, sizeof(*connector), GFP_KERNEL);

	if (!connector) {

		DRM_ERROR("failed to alloc memory when init connector\n");

		return ERR_PTR(-ENOMEM);

	}



	ret = drm_connector_init(dev, connector,

				 &hibmc_connector_funcs,

				 DRM_MODE_CONNECTOR_VGA);

	if (ret) {

		DRM_ERROR("failed to init connector: %d\n", ret);

		return ERR_PTR(ret);

	}

	drm_connector_helper_add(connector,

				 &hibmc_connector_helper_funcs);



	return connector;

}



static void hibmc_encoder_mode_set(struct drm_encoder *encoder,

				   struct drm_display_mode *mode,

				   struct drm_display_mode *adj_mode)
@@ -105,23 +79,10 @@ static const struct drm_encoder_funcs hibmc_encoder_funcs = { 
int hibmc_vdac_init(struct hibmc_drm_private *priv)

{

	struct drm_device *dev = priv->dev;

	struct drm_encoder *encoder;

	struct drm_connector *connector;

	struct drm_encoder *encoder = &priv->encoder;

	struct drm_connector *connector = &priv->connector;

	int ret;



	connector = hibmc_connector_init(priv);

	if (IS_ERR(connector)) {

		DRM_ERROR("failed to create connector: %ld\n",

			  PTR_ERR(connector));

		return PTR_ERR(connector);

	}



	encoder = devm_kzalloc(dev->dev, sizeof(*encoder), GFP_KERNEL);

	if (!encoder) {

		DRM_ERROR("failed to alloc memory when init encoder\n");

		return -ENOMEM;

	}



	encoder->possible_crtcs = 0x1;

	ret = drm_encoder_init(dev, encoder, &hibmc_encoder_funcs,

			       DRM_MODE_ENCODER_DAC, NULL);
@@ -131,6 +92,15 @@ int hibmc_vdac_init(struct hibmc_drm_private *priv) 
	}



	drm_encoder_helper_add(encoder, &hibmc_encoder_helper_funcs);



	ret = drm_connector_init(dev, connector, &hibmc_connector_funcs,

				 DRM_MODE_CONNECTOR_VGA);

	if (ret) {

		DRM_ERROR("failed to init connector: %d\n", ret);

		return ret;

	}

	drm_connector_helper_add(connector, &hibmc_connector_helper_funcs);



	drm_connector_attach_encoder(connector, encoder);



	return 0;