Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drm/msm/dpu: inline _setup_mixer_ops()

Inline the _setup_mixer_ops() function, it makes it easier to handle
different conditions involving LM configuration.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/655369/
Link: https://lore.kernel.org/r/20250522-dpu-drop-features-v5-6-3b2085a07884@oss.qualcomm.com

authored by

Dmitry Baryshkov and committed by
Dmitry Baryshkov
a150c904 6ba16b49

+9 -15
+9 -15
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c
··· 144 144 DPU_REG_WRITE(c, LM_OP_MODE, op_mode); 145 145 } 146 146 147 - static void _setup_mixer_ops(struct dpu_hw_lm_ops *ops, 148 - unsigned long features) 149 - { 150 - ops->setup_mixer_out = dpu_hw_lm_setup_out; 151 - if (test_bit(DPU_MIXER_COMBINED_ALPHA, &features)) 152 - ops->setup_blend_config = dpu_hw_lm_setup_blend_config_combined_alpha; 153 - else 154 - ops->setup_blend_config = dpu_hw_lm_setup_blend_config; 155 - ops->setup_alpha_out = dpu_hw_lm_setup_color3; 156 - ops->setup_border_color = dpu_hw_lm_setup_border_color; 157 - ops->setup_misr = dpu_hw_lm_setup_misr; 158 - ops->collect_misr = dpu_hw_lm_collect_misr; 159 - } 160 - 161 147 /** 162 148 * dpu_hw_lm_init() - Initializes the mixer hw driver object. 163 149 * should be called once before accessing every mixer. ··· 172 186 /* Assign ops */ 173 187 c->idx = cfg->id; 174 188 c->cap = cfg; 175 - _setup_mixer_ops(&c->ops, c->cap->features); 189 + c->ops.setup_mixer_out = dpu_hw_lm_setup_out; 190 + if (test_bit(DPU_MIXER_COMBINED_ALPHA, &c->cap->features)) 191 + c->ops.setup_blend_config = dpu_hw_lm_setup_blend_config_combined_alpha; 192 + else 193 + c->ops.setup_blend_config = dpu_hw_lm_setup_blend_config; 194 + c->ops.setup_alpha_out = dpu_hw_lm_setup_color3; 195 + c->ops.setup_border_color = dpu_hw_lm_setup_border_color; 196 + c->ops.setup_misr = dpu_hw_lm_setup_misr; 197 + c->ops.collect_misr = dpu_hw_lm_collect_misr; 176 198 177 199 return c; 178 200 }