Re: [PATCH] drm/msm/dpu: enable sourcesplit for sc7180/sc7280

[Abhinav Kumar <quic_abhinavk@xxxxxxxxxxx>]

On 1/15/2023 7:44 PM, Dmitry Baryshkov wrote:
> According to the vendor dts files, both sc7180 and sc7280 support the
> source split mode (using two LMs for a single output). Change these two
> platforms to use MIXER_SDM845_MASK, which includes
> DPU_MIXER_SOURCESPLIT. Rename MIXER_SC7180_MASK to MIXER_QCM2290_MASK,
> since this platform doesn't seem to support source split mode.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>

Names are getting confusing with mask name re-uses, till the hw catalog 
split have to live with it I guess.

I need to double-check about QCM 2290, but since this change is keeping 
current masks for it and just renaming,

Reviewed-by: Abhinav Kumar <quic_abhinavk@xxxxxxxxxxx>

> ---
>   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 14 +++++++-------
>   1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> index 22ad996e9014..835d6d2c4115 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> @@ -56,7 +56,7 @@
>   #define MIXER_SDM845_MASK \
>   	(BIT(DPU_MIXER_SOURCESPLIT) | BIT(DPU_DIM_LAYER) | BIT(DPU_MIXER_COMBINED_ALPHA))
>   
> -#define MIXER_SC7180_MASK \
> +#define MIXER_QCM2290_MASK \
>   	(BIT(DPU_DIM_LAYER) | BIT(DPU_MIXER_COMBINED_ALPHA))
>   
>   #define PINGPONG_SDM845_MASK BIT(DPU_PINGPONG_DITHER)
> @@ -1464,9 +1464,9 @@ static const struct dpu_lm_sub_blks sc7180_lm_sblk = {
>   };
>   
>   static const struct dpu_lm_cfg sc7180_lm[] = {
> -	LM_BLK("lm_0", LM_0, 0x44000, MIXER_SC7180_MASK,
> +	LM_BLK("lm_0", LM_0, 0x44000, MIXER_SDM845_MASK,
>   		&sc7180_lm_sblk, PINGPONG_0, LM_1, DSPP_0),
> -	LM_BLK("lm_1", LM_1, 0x45000, MIXER_SC7180_MASK,
> +	LM_BLK("lm_1", LM_1, 0x45000, MIXER_SDM845_MASK,
>   		&sc7180_lm_sblk, PINGPONG_1, LM_0, 0),
>   };
>   
> @@ -1499,11 +1499,11 @@ static const struct dpu_lm_cfg sm8150_lm[] = {
>   };
>   
>   static const struct dpu_lm_cfg sc7280_lm[] = {
> -	LM_BLK("lm_0", LM_0, 0x44000, MIXER_SC7180_MASK,
> +	LM_BLK("lm_0", LM_0, 0x44000, MIXER_SDM845_MASK,
>   		&sc7180_lm_sblk, PINGPONG_0, 0, DSPP_0),
> -	LM_BLK("lm_2", LM_2, 0x46000, MIXER_SC7180_MASK,
> +	LM_BLK("lm_2", LM_2, 0x46000, MIXER_SDM845_MASK,
>   		&sc7180_lm_sblk, PINGPONG_2, LM_3, 0),
> -	LM_BLK("lm_3", LM_3, 0x47000, MIXER_SC7180_MASK,
> +	LM_BLK("lm_3", LM_3, 0x47000, MIXER_SDM845_MASK,
>   		&sc7180_lm_sblk, PINGPONG_3, LM_2, 0),
>   };
>   
> @@ -1518,7 +1518,7 @@ static const struct dpu_lm_sub_blks qcm2290_lm_sblk = {
>   };
>   
>   static const struct dpu_lm_cfg qcm2290_lm[] = {
> -	LM_BLK("lm_0", LM_0, 0x44000, MIXER_SC7180_MASK,
> +	LM_BLK("lm_0", LM_0, 0x44000, MIXER_QCM2290_MASK,
>   		&qcm2290_lm_sblk, PINGPONG_0, 0, DSPP_0),
>   };
>