diff --git a/drivers/video/drm/dw_mipi_dsi.c b/drivers/video/drm/dw_mipi_dsi.c index 81f9f07f4b..0ea2ed5255 100644 --- a/drivers/video/drm/dw_mipi_dsi.c +++ b/drivers/video/drm/dw_mipi_dsi.c @@ -1109,7 +1109,7 @@ static int dw_mipi_dsi_connector_init(struct display_state *state) if (!dsi->master) return -ENODEV; - conn_state->output_type = ROCKCHIP_OUTPUT_DSI_DUAL_LINK; + conn_state->output_flags = ROCKCHIP_OUTPUT_DATA_SWAP; } #endif @@ -1138,7 +1138,8 @@ static int dw_mipi_dsi_connector_init(struct display_state *state) dsi->slave->format = dsi->format; dsi->slave->mode_flags = dsi->mode_flags; dsi->slave->channel = dsi->channel; - conn_state->output_type = ROCKCHIP_OUTPUT_DSI_DUAL_CHANNEL; + conn_state->output_flags = + ROCKCHIP_OUTPUT_DUAL_CHANNEL_LEFT_RIGHT_MODE; conn_state->output_if |= VOP_OUTPUT_IF_MIPI1; #if defined(CONFIG_ROCKCHIP_RK3568) diff --git a/drivers/video/drm/rockchip_display.h b/drivers/video/drm/rockchip_display.h index 4b136556a6..dcf28fcc59 100644 --- a/drivers/video/drm/rockchip_display.h +++ b/drivers/video/drm/rockchip_display.h @@ -12,9 +12,6 @@ #include #include -#define ROCKCHIP_OUTPUT_DSI_DUAL_CHANNEL BIT(0) -#define ROCKCHIP_OUTPUT_DSI_DUAL_LINK BIT(1) - #define ROCKCHIP_OUTPUT_DUAL_CHANNEL_LEFT_RIGHT_MODE BIT(0) #define ROCKCHIP_OUTPUT_DUAL_CHANNEL_ODD_EVEN_MODE BIT(1) #define ROCKCHIP_OUTPUT_DATA_SWAP BIT(2) @@ -139,7 +136,6 @@ struct connector_state { int bus_format; int output_mode; int type; - int output_type; int output_if; int output_flags; int color_space; diff --git a/drivers/video/drm/rockchip_vop.c b/drivers/video/drm/rockchip_vop.c index aa3d0c5f9c..89d5852e19 100644 --- a/drivers/video/drm/rockchip_vop.c +++ b/drivers/video/drm/rockchip_vop.c @@ -311,9 +311,9 @@ static int rockchip_vop_init(struct display_state *state) VOP_CTRL_SET(vop, mipi_pin_pol, val); VOP_CTRL_SET(vop, mipi_dclk_pol, dclk_inv); VOP_CTRL_SET(vop, mipi_dual_channel_en, - !!(conn_state->output_type & ROCKCHIP_OUTPUT_DSI_DUAL_CHANNEL)); + !!(conn_state->output_flags & ROCKCHIP_OUTPUT_DUAL_CHANNEL_LEFT_RIGHT_MODE)); VOP_CTRL_SET(vop, data01_swap, - !!(conn_state->output_type & ROCKCHIP_OUTPUT_DSI_DUAL_LINK) || + !!(conn_state->output_flags & ROCKCHIP_OUTPUT_DATA_SWAP) || crtc_state->dual_channel_swap); break; case DRM_MODE_CONNECTOR_DisplayPort: