[PATCH 4/4] drm/msm/dpu: move PINGPONG_NONE check to dpu_lm_init()

[Marijn Suijten]

On 2023-04-30 23:35:56, Dmitry Baryshkov wrote:
> Move the check for lm->pingpong being not NONE from dpu_rm_init() to
> dpu_lm_init(), following the change to dpu_hw_intf_init().
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov at linaro.org>

In some way I also suggested this change in [1], but did not receive a
(N)ACK.

[1]: https://lore.kernel.org/linux-arm-msm/ecopixnagol7yd5znvmjanknqbv7vi4ayy36vchaeyyhuavu4w@rkdfllrd4uzb/

Reviewed-by: Marijn Suijten <marijn.suijten at somainline.org>

> ---
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 5 +++++
>  drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c    | 5 -----
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c
> index 214f207ddf8a..d1c3bd8379ea 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c
> @@ -161,6 +161,11 @@ struct dpu_hw_mixer *dpu_hw_lm_init(const struct dpu_lm_cfg *cfg,
>  {
>  	struct dpu_hw_mixer *c;
>  
> +	if (cfg->pingpong == PINGPONG_NONE) {
> +		DPU_DEBUG("skip mixer %d without pingpong\n", cfg->id);
> +		return NULL;
> +	}
> +
>  	c = kzalloc(sizeof(*c), GFP_KERNEL);
>  	if (!c)
>  		return ERR_PTR(-ENOMEM);
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c
> index bf7b8e7c45b1..2ca3c666e22f 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c
> @@ -117,11 +117,6 @@ int dpu_rm_init(struct dpu_rm *rm,
>  		struct dpu_hw_mixer *hw;
>  		const struct dpu_lm_cfg *lm = &cat->mixer[i];
>  
> -		if (lm->pingpong == PINGPONG_NONE) {
> -			DPU_DEBUG("skip mixer %d without pingpong\n", lm->id);
> -			continue;
> -		}
> -
>  		hw = dpu_hw_lm_init(lm, mmio);
>  		if (IS_ERR(hw)) {
>  			rc = PTR_ERR(hw);
> -- 
> 2.39.2
>