drm/amd/display: Update background color in bottommost mpcc
authorHugo Hu <hugo.hu@amd.com>
Fri, 25 Oct 2019 07:33:15 +0000 (15:33 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 19 Nov 2019 15:12:51 +0000 (10:12 -0500)
[Why]
Background color only takes effect in bottommost mpcc.

[How]
Update background color in bottommost mpcc.

Signed-off-by: Hugo Hu <hugo.hu@amd.com>
Reviewed-by: Yongqiang Sun <yongqiang.sun@amd.com>
Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c

index 220154f..04f8634 100644 (file)
@@ -42,20 +42,27 @@ void mpc1_set_bg_color(struct mpc *mpc,
                int mpcc_id)
 {
        struct dcn10_mpc *mpc10 = TO_DCN10_MPC(mpc);
+       struct mpcc *bottommost_mpcc = mpc1_get_mpcc(mpc, mpcc_id);
+       uint32_t bg_r_cr, bg_g_y, bg_b_cb;
+
+       /* find bottommost mpcc. */
+       while (bottommost_mpcc->mpcc_bot) {
+               bottommost_mpcc = bottommost_mpcc->mpcc_bot;
+       }
 
        /* mpc color is 12 bit.  tg_color is 10 bit */
        /* todo: might want to use 16 bit to represent color and have each
         * hw block translate to correct color depth.
         */
-       uint32_t bg_r_cr = bg_color->color_r_cr << 2;
-       uint32_t bg_g_y = bg_color->color_g_y << 2;
-       uint32_t bg_b_cb = bg_color->color_b_cb << 2;
+       bg_r_cr = bg_color->color_r_cr << 2;
+       bg_g_y = bg_color->color_g_y << 2;
+       bg_b_cb = bg_color->color_b_cb << 2;
 
-       REG_SET(MPCC_BG_R_CR[mpcc_id], 0,
+       REG_SET(MPCC_BG_R_CR[bottommost_mpcc->mpcc_id], 0,
                        MPCC_BG_R_CR, bg_r_cr);
-       REG_SET(MPCC_BG_G_Y[mpcc_id], 0,
+       REG_SET(MPCC_BG_G_Y[bottommost_mpcc->mpcc_id], 0,
                        MPCC_BG_G_Y, bg_g_y);
-       REG_SET(MPCC_BG_B_CB[mpcc_id], 0,
+       REG_SET(MPCC_BG_B_CB[bottommost_mpcc->mpcc_id], 0,
                        MPCC_BG_B_CB, bg_b_cb);
 }