diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index b6de90e91062..080f250c9d75 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -2910,7 +2910,7 @@ static void vop_crtc_atomic_enable(struct drm_crtc *crtc, int act_end; bool interlaced = !!(adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE); int for_ddr_freq = 0; - bool dclk_inv, yc_swap = false, uv_swap = false; + bool dclk_inv, yc_swap = false; rockchip_set_system_status(sys_status); vop_lock(vop); @@ -2960,9 +2960,7 @@ static void vop_crtc_atomic_enable(struct drm_crtc *crtc, if (s->output_if & VOP_OUTPUT_IF_BT1120) { VOP_CTRL_SET(vop, bt1120_en, 1); yc_swap = is_yc_swap(s->bus_format); - uv_swap = is_uv_swap(s->bus_format, s->output_mode); VOP_CTRL_SET(vop, bt1120_yc_swap, yc_swap); - VOP_CTRL_SET(vop, bt1120_uv_swap, uv_swap); } break; case DRM_MODE_CONNECTOR_eDP: diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h index 81a7a18362dc..77e02097d763 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h @@ -258,7 +258,6 @@ struct vop_ctrl { struct vop_reg mcu_rw_bypass_port; /* bt1120 */ - struct vop_reg bt1120_uv_swap; struct vop_reg bt1120_yc_swap; struct vop_reg bt1120_en; @@ -739,9 +738,7 @@ struct vop2_ctrl { struct vop_reg dst_alpha_ctrl; struct vop_reg bt1120_yc_swap; - struct vop_reg bt1120_uv_swap; struct vop_reg bt656_yc_swap; - struct vop_reg bt656_uv_swap; struct vop_reg reg_done_frm; struct vop_reg cfg_done; diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index ced5472168c6..f90ad7fb6bda 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -2658,7 +2658,7 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc, struct drm_crtc_state int sys_status = SYS_STATUS_LCDC0; uint8_t out_mode; int for_ddr_freq = 0; - bool dclk_inv, yc_swap = false, uv_swap = false; + bool dclk_inv, yc_swap = false; int act_end; uint32_t val; @@ -2694,9 +2694,7 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc, struct drm_crtc_state VOP_CTRL_SET(vop2, rgb_mux, vp_data->id); VOP_GRF_SET(vop2, grf_bt1120_clk_inv, !dclk_inv); yc_swap = vop2_output_yc_swap(vcstate->bus_format); - uv_swap = vop2_output_uv_swap(vcstate->bus_format, vcstate->output_mode); VOP_CTRL_SET(vop2, bt1120_yc_swap, yc_swap); - VOP_CTRL_SET(vop2, bt1120_uv_swap, uv_swap); } if (vcstate->output_if & VOP_OUTPUT_IF_BT656) { @@ -2704,9 +2702,7 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc, struct drm_crtc_state VOP_CTRL_SET(vop2, rgb_mux, vp_data->id); VOP_GRF_SET(vop2, grf_bt656_clk_inv, !dclk_inv); yc_swap = vop2_output_yc_swap(vcstate->bus_format); - uv_swap = vop2_output_uv_swap(vcstate->bus_format, vcstate->output_mode); VOP_CTRL_SET(vop2, bt656_yc_swap, yc_swap); - VOP_CTRL_SET(vop2, bt656_uv_swap, uv_swap); } if (vcstate->output_if & VOP_OUTPUT_IF_LVDS0) { diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c index 12e1b25bb383..61591c577d8f 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c @@ -972,9 +972,7 @@ static const struct vop2_ctrl rk3568_vop_ctrl = { .lvds_dual_en = VOP_REG(RK3568_DSP_IF_CTRL, 0x1, 0), .lvds_dual_mode = VOP_REG(RK3568_DSP_IF_CTRL, 0x1, 1), .lvds_dual_channel_swap = VOP_REG(RK3568_DSP_IF_CTRL, 0x1, 2), - .bt656_uv_swap = VOP_REG(RK3568_DSP_IF_CTRL, 0x1, 4), .bt656_yc_swap = VOP_REG(RK3568_DSP_IF_CTRL, 0x1, 5), - .bt1120_uv_swap = VOP_REG(RK3568_DSP_IF_CTRL, 0x1, 8), .bt1120_yc_swap = VOP_REG(RK3568_DSP_IF_CTRL, 0x1, 9), .lvds_pin_pol = VOP_REG(RK3568_DSP_IF_POL, 0x7, 0), .lvds_dclk_pol = VOP_REG(RK3568_DSP_IF_POL, 0x1, 3), diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c index dd9a5ad44b1b..f6d917c0b9f7 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c @@ -1735,7 +1735,6 @@ static const struct vop_ctrl rv1126_ctrl_data = { .mcu_type = VOP_REG(RK3366_LIT_MCU_CTRL, 0x1, 31), .mcu_rw_bypass_port = VOP_REG(RK3366_LIT_MCU_RW_BYPASS_PORT, 0xffffffff, 0), - .bt1120_uv_swap = VOP_REG(RK3366_LIT_DSP_CTRL2, 0x1, 11), .bt1120_yc_swap = VOP_REG(RK3366_LIT_DSP_CTRL0, 0x1, 30), .bt1120_en = VOP_REG(RK3366_LIT_DSP_CTRL0, 0x1, 31), };