qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

video/drm: remove DSI special assign 

these flags will be used by other output interface, so remove
DSI special assign.

Change-Id: Ieb3a20e62c2b899e6757635eced86b85e1fb22f7
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
This commit is contained in:
Guochun Huang 2020-12-24 09:23:55 +08:00 committed by Jianhong Chen
parent 0309acda6d
commit bee25ee674
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/video/drm/dw_mipi_dsi.c
View File

@ -1109,7 +1109,7 @@ static int dw_mipi_dsi_connector_init(struct display_state *state)
if (!dsi->master) if (!dsi->master)
return -ENODEV; return -ENODEV;
conn_state->output_type = ROCKCHIP_OUTPUT_DSI_DUAL_LINK; conn_state->output_flags = ROCKCHIP_OUTPUT_DATA_SWAP;
} }
#endif #endif
@ -1138,7 +1138,8 @@ static int dw_mipi_dsi_connector_init(struct display_state *state)
dsi->slave->format = dsi->format; dsi->slave->format = dsi->format;
dsi->slave->mode_flags = dsi->mode_flags; dsi->slave->mode_flags = dsi->mode_flags;
dsi->slave->channel = dsi->channel; 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; conn_state->output_if |= VOP_OUTPUT_IF_MIPI1;
#if defined(CONFIG_ROCKCHIP_RK3568) #if defined(CONFIG_ROCKCHIP_RK3568)

4
drivers/video/drm/rockchip_display.h
View File

@ -12,9 +12,6 @@
#include <edid.h> #include <edid.h>
#include <dm/ofnode.h> #include <dm/ofnode.h>
#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_LEFT_RIGHT_MODE BIT(0)
#define ROCKCHIP_OUTPUT_DUAL_CHANNEL_ODD_EVEN_MODE BIT(1) #define ROCKCHIP_OUTPUT_DUAL_CHANNEL_ODD_EVEN_MODE BIT(1)
#define ROCKCHIP_OUTPUT_DATA_SWAP BIT(2) #define ROCKCHIP_OUTPUT_DATA_SWAP BIT(2)
@ -139,7 +136,6 @@ struct connector_state {
int bus_format; int bus_format;
int output_mode; int output_mode;
int type; int type;
int output_type;
int output_if; int output_if;
int output_flags; int output_flags;
int color_space; int color_space;

4
drivers/video/drm/rockchip_vop.c
View File

@ -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_pin_pol, val);
VOP_CTRL_SET(vop, mipi_dclk_pol, dclk_inv); VOP_CTRL_SET(vop, mipi_dclk_pol, dclk_inv);
VOP_CTRL_SET(vop, mipi_dual_channel_en, 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, 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); crtc_state->dual_channel_swap);
break; break;
case DRM_MODE_CONNECTOR_DisplayPort: case DRM_MODE_CONNECTOR_DisplayPort: