Swap video layer

Change-Id: Iab0e18f959e4cc47cba47ae7b6a5c33ff3baf15e
Reviewed-on: https://tp-biosrd-v02/gerrit/81884
Reviewed-by: Jamess Huang(黃以民) <Jamess_Huang@asus.com>
Tested-by: Jamess Huang(黃以民) <Jamess_Huang@asus.com>

Author: topdjgod

drivers/gpu/drm/rockchip/rockchip_drm_vop.c

@@ -1297,6 +1297,12 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
 		VOP_WIN_SET_EXT(vop, win, csc, r2r_en, !!r2r_table);
 		VOP_WIN_SET_EXT(vop, win, csc, r2y_en, !!r2y_table);
 	}
+
+	if (plane->type == DRM_PLANE_TYPE_PRIMARY) {
+		VOP_WIN_SET(vop, win, key_color, 0x00000000);
+		VOP_WIN_SET(vop, win, key_en, 1);
+	}
+
 	VOP_WIN_SET(vop, win, enable, 1);
 	spin_unlock(&vop->reg_lock);
 	vop->is_iommu_needed = true;

drivers/gpu/drm/rockchip/rockchip_vop_reg.c

@@ -121,6 +121,8 @@ static const struct vop_win_phy rk3288_win01_data = {
 	.src_alpha_ctl = VOP_REG(RK3288_WIN0_SRC_ALPHA_CTRL, 0xffffffff, 0),
 	.dst_alpha_ctl = VOP_REG(RK3288_WIN0_DST_ALPHA_CTRL, 0xffffffff, 0),
 	.channel = VOP_REG_VER(RK3288_WIN0_CTRL2, 0xff, 0, 3, 8, 8),
+	.key_color = VOP_REG(RK3288_WIN0_COLOR_KEY, 0x3fffffff, 0),
+	.key_en = VOP_REG(RK3288_WIN0_COLOR_KEY, 0x1, 31),
 };
 
 static const struct vop_win_phy rk3288_win23_data = {
@@ -255,9 +257,9 @@ static const struct vop_ctrl rk3288_ctrl_data = {
  */
 static const struct vop_win_data rk3288_vop_win_data[] = {
 	{ .base = 0x00, .phy = &rk3288_win01_data,
-	  .type = DRM_PLANE_TYPE_PRIMARY },
-	{ .base = 0x40, .phy = &rk3288_win01_data,
 	  .type = DRM_PLANE_TYPE_OVERLAY },
+	{ .base = 0x40, .phy = &rk3288_win01_data,
+	  .type = DRM_PLANE_TYPE_PRIMARY },
 	{ .base = 0x00, .phy = &rk3288_win23_data,
 	  .type = DRM_PLANE_TYPE_OVERLAY,
 	  .area = rk3288_area_data,