[PATCH v4 06/30] drm/msm/dpu: inline _setup_mixer_ops()

[neil.armstrong at linaro.org]

On 19/05/2025 18:04, Dmitry Baryshkov wrote:
> From: Dmitry Baryshkov <dmitry.baryshkov at linaro.org>
> 
> Inline the _setup_mixer_ops() function, it makes it easier to handle
> different conditions involving LM configuration.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov at linaro.org>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov at oss.qualcomm.com>
> ---
>   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 24 +++++++++---------------
>   1 file changed, 9 insertions(+), 15 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 81b56f066519a68c9e72f0b42df12652139ab83a..4f57cfca89bd3962e7e512952809db0300cb9baf 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c
> @@ -144,20 +144,6 @@ static void dpu_hw_lm_setup_color3(struct dpu_hw_mixer *ctx,
>   	DPU_REG_WRITE(c, LM_OP_MODE, op_mode);
>   }
>   
> -static void _setup_mixer_ops(struct dpu_hw_lm_ops *ops,
> -		unsigned long features)
> -{
> -	ops->setup_mixer_out = dpu_hw_lm_setup_out;
> -	if (test_bit(DPU_MIXER_COMBINED_ALPHA, &features))
> -		ops->setup_blend_config = dpu_hw_lm_setup_blend_config_combined_alpha;
> -	else
> -		ops->setup_blend_config = dpu_hw_lm_setup_blend_config;
> -	ops->setup_alpha_out = dpu_hw_lm_setup_color3;
> -	ops->setup_border_color = dpu_hw_lm_setup_border_color;
> -	ops->setup_misr = dpu_hw_lm_setup_misr;
> -	ops->collect_misr = dpu_hw_lm_collect_misr;
> -}
> -
>   /**
>    * dpu_hw_lm_init() - Initializes the mixer hw driver object.
>    * should be called once before accessing every mixer.
> @@ -186,7 +172,15 @@ struct dpu_hw_mixer *dpu_hw_lm_init(struct drm_device *dev,
>   	/* Assign ops */
>   	c->idx = cfg->id;
>   	c->cap = cfg;
> -	_setup_mixer_ops(&c->ops, c->cap->features);
> +	c->ops.setup_mixer_out = dpu_hw_lm_setup_out;
> +	if (test_bit(DPU_MIXER_COMBINED_ALPHA, &c->cap->features))
> +		c->ops.setup_blend_config = dpu_hw_lm_setup_blend_config_combined_alpha;
> +	else
> +		c->ops.setup_blend_config = dpu_hw_lm_setup_blend_config;
> +	c->ops.setup_alpha_out = dpu_hw_lm_setup_color3;
> +	c->ops.setup_border_color = dpu_hw_lm_setup_border_color;
> +	c->ops.setup_misr = dpu_hw_lm_setup_misr;
> +	c->ops.collect_misr = dpu_hw_lm_collect_misr;
>   
>   	return c;
>   }
> 

Reviewed-by: Neil Armstrong <neil.armstrong at linaro.org>