[PATCH 21/21] drm/msm/dpu: Set possible clones for all encoders

[Dmitry Baryshkov]

On Thu, Aug 29, 2024 at 01:48:42PM GMT, Jessica Zhang wrote:
> Set writeback encoders as possible clones for non-writeback encoders and
> vice versa.
> 
> Signed-off-by: Jessica Zhang <quic_jesszhan at quicinc.com>
> ---
>  drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 27 +++++++++++++++++++++++++++
>  drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h |  7 +++++++
>  drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c     |  7 +++++--
>  3 files changed, 39 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> index 47b5a5994234..aad659e6d35b 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> @@ -2352,6 +2352,33 @@ static int dpu_encoder_virt_add_phys_encs(
>  	return 0;
>  }
>  

Docs should go here.

> +uint32_t dpu_encoder_get_clones(struct drm_encoder *drm_enc)
> +{
> +	struct drm_encoder *curr;
> +	int type = drm_enc->encoder_type;
> +	uint32_t clone_mask = drm_encoder_mask(drm_enc);
> +
> +	/*
> +	 * Set writeback as possible clones of real-time encoders and real-time
> +	 * encoders as clones of writeback.
> +	 *
> +	 * Writeback encoders can't be clones of each other and real-time
> +	 * encoders can't be clones of each other.
> +	 */
> +	drm_for_each_encoder(curr, drm_enc->dev) {
> +		if (type == DRM_MODE_ENCODER_VIRTUAL &&
> +				curr->encoder_type == DRM_MODE_ENCODER_VIRTUAL)
> +			continue;
> +		if (type != DRM_MODE_ENCODER_VIRTUAL &&
> +				curr->encoder_type != DRM_MODE_ENCODER_VIRTUAL)

Align to opening brackets.

> +			continue;
> +
> +		clone_mask |= drm_encoder_mask(curr);
> +	}
> +
> +	return clone_mask;
> +}
> +
>  static int dpu_encoder_setup_display(struct dpu_encoder_virt *dpu_enc,
>  				 struct dpu_kms *dpu_kms,
>  				 struct msm_display_info *disp_info)
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h
> index 7ab5f9380bf5..70eda127488a 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h
> @@ -98,6 +98,13 @@ enum dpu_intf_mode dpu_encoder_get_intf_mode(struct drm_encoder *encoder);
>   */
>  void dpu_encoder_virt_runtime_resume(struct drm_encoder *encoder);
>  
> +/**
> + * dpu_encoder_get_clones - set possible_clones for DPU encoder
> + * @drm_enc:        DRM encoder pointer
> + * Returns:         possible_clones mask
> + */
> +uint32_t dpu_encoder_get_clones(struct drm_encoder *drm_enc);
> +
>  /**
>   * dpu_encoder_init - initialize virtual encoder object
>   * @dev:        Pointer to drm device structure
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
> index 87526d3c224a..1a82aa61d217 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
> @@ -2,7 +2,7 @@
>  /*
>   * Copyright (C) 2013 Red Hat
>   * Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.
> - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
> + * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
>   *
>   * Author: Rob Clark <robdclark at gmail.com>
>   */
> @@ -793,8 +793,11 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms)
>  		return ret;
>  
>  	num_encoders = 0;
> -	drm_for_each_encoder(encoder, dev)
> +	drm_for_each_encoder(encoder, dev) {
>  		num_encoders++;
> +		if (catalog->cwb_count > 0)
> +			encoder->possible_clones = dpu_encoder_get_clones(encoder);
> +	}
>  
>  	max_crtc_count = min(catalog->mixer_count, num_encoders);
>  
> 
> -- 
> 2.34.1
> 

-- 
With best wishes
Dmitry