In order to be more obvious in fg_alpha / bg_alpha handling during the
blending programming drop the default setting for background alpha value
and set it explicitly in all cases.

Signed-off-by: Dmitry Baryshkov <[email protected]>
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c 
b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
index 
d4b545448d74657aafc96e9042c7756654b4f0e7..651159e8731194d75b52c05158bfd1c9bad8b10c
 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
@@ -335,13 +335,13 @@ static void _dpu_crtc_setup_blend_cfg(struct 
dpu_crtc_mixer *mixer,
                max_alpha = 0x3ff;
                fg_alpha = pstate->base.alpha >> 6;
        }
-       bg_alpha = max_alpha - fg_alpha;
 
        /* default to opaque blending */
        if (pstate->base.pixel_blend_mode == DRM_MODE_BLEND_PIXEL_NONE ||
            !format->alpha_enable) {
                blend_op = DPU_BLEND_FG_ALPHA_FG_CONST |
                        DPU_BLEND_BG_ALPHA_BG_CONST;
+               bg_alpha = max_alpha - fg_alpha;
        } else if (pstate->base.pixel_blend_mode == DRM_MODE_BLEND_PREMULTI) {
                blend_op = DPU_BLEND_FG_ALPHA_FG_CONST |
                        DPU_BLEND_BG_ALPHA_FG_PIXEL;
@@ -350,6 +350,7 @@ static void _dpu_crtc_setup_blend_cfg(struct dpu_crtc_mixer 
*mixer,
                        blend_op |= DPU_BLEND_BG_MOD_ALPHA |
                                    DPU_BLEND_BG_INV_MOD_ALPHA;
                } else {
+                       bg_alpha = 0;
                        blend_op |= DPU_BLEND_BG_INV_ALPHA;
                }
        } else {
@@ -363,6 +364,7 @@ static void _dpu_crtc_setup_blend_cfg(struct dpu_crtc_mixer 
*mixer,
                                    DPU_BLEND_BG_MOD_ALPHA |
                                    DPU_BLEND_BG_INV_MOD_ALPHA;
                } else {
+                       bg_alpha = 0;
                        blend_op |= DPU_BLEND_BG_INV_ALPHA;
                }
        }

-- 
2.47.3

Reply via email to