[PATCH v3] drm/hisilicon: Code refactoring for hibmc_drv_vdac

[Thomas Zimmermann]

Hi

Am 02.07.20 um 12:12 schrieb Thomas Zimmermann:
> Thanks!
> 
> Am 02.07.20 um 10:54 schrieb Tian Tao:
>> 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: Tian Tao <tiantao6 at hisilicon.com>
> 
> Reviewed-by: Thomas Zimmermann <tzimmermann at suse.de>
> 
> Maybe others want to comment on the patch, so I'll give it a few more
> days before I add it to drm-misc-next. Don't hesitate to ping me if I
> forget about it.

I've added the patch to drm-misc-next

> 
> Best regards
> Thomas
> 
>> ---
>>  drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h  |  2 +
>>  drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 52 +++++-------------------
>>  2 files changed, 13 insertions(+), 41 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
>> index 50a0c1f..6097687 100644
>> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
>> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
>> @@ -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;
>>  };
>>  
>> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
>> index 678ac2e..2ca69c3 100644
>> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
>> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
>> @@ -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;
>>
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 516 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20200706/108d790f/attachment.sig>