[PATCH RESEND v2 1/3] drm/vkms: refactor overlay plane creation

[Melissa Wen]

On 01/07, José Expósito wrote:
> Move the logic to create an overlay plane to its own function.
> Refactor, no functional changes.
> 
> Signed-off-by: José Expósito <jose.exposito89 at gmail.com>
> ---
>  drivers/gpu/drm/vkms/vkms_output.c | 26 +++++++++++++++++++-------
>  1 file changed, 19 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c
> index 04406bd3ff02..2e805b2d36ae 100644
> --- a/drivers/gpu/drm/vkms/vkms_output.c
> +++ b/drivers/gpu/drm/vkms/vkms_output.c
> @@ -32,6 +32,21 @@ static const struct drm_connector_helper_funcs vkms_conn_helper_funcs = {
>  	.get_modes    = vkms_conn_get_modes,
>  };
>  
> +static int vkms_add_overlay_plane(struct vkms_device *vkmsdev, int index,
> +				  struct drm_crtc *crtc)
> +{
> +	struct vkms_plane *overlay;
> +
> +	overlay = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_OVERLAY, index);
> +	if (IS_ERR(overlay))
> +		return PTR_ERR(overlay);
> +
> +	if (!overlay->base.possible_crtcs)
> +		overlay->base.possible_crtcs = drm_crtc_mask(crtc);
> +
> +	return 0;
> +}
> +
>  int vkms_output_init(struct vkms_device *vkmsdev, int index)
>  {
>  	struct vkms_output *output = &vkmsdev->output;
> @@ -39,7 +54,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int index)
>  	struct drm_connector *connector = &output->connector;
>  	struct drm_encoder *encoder = &output->encoder;
>  	struct drm_crtc *crtc = &output->crtc;
> -	struct vkms_plane *primary, *cursor = NULL, *overlay = NULL;
> +	struct vkms_plane *primary, *cursor = NULL;
>  	int ret;
>  	int writeback;
>  
> @@ -48,12 +63,9 @@ int vkms_output_init(struct vkms_device *vkmsdev, int index)
>  		return PTR_ERR(primary);
>  
>  	if (vkmsdev->config->overlay) {
> -		overlay = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_OVERLAY, index);
> -		if (IS_ERR(overlay))
> -			return PTR_ERR(overlay);
> -
> -		if (!overlay->base.possible_crtcs)
> -			overlay->base.possible_crtcs = drm_crtc_mask(crtc);
> +		ret = vkms_add_overlay_plane(vkmsdev, index, crtc);
> +		if (ret)
> +			return ret;
lgtm, thanks!

Reviewed-by: Melissa Wen <mwen at igalia.com>
>  	}
>  
>  	if (vkmsdev->config->cursor) {
> -- 
> 2.25.1
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20220109/6f5d4c01/attachment.sig>