From 44a44675525db201136f4cbfe02b678b77b4e779 Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Tue, 20 Oct 2020 17:57:32 +0800 Subject: [PATCH] drm/rockchip: remove DSI special assign these flags will be used by other output interface, so remove DSI special assign. Change-Id: I6ede559deee14a0336e4037c709e5a36d4686c4a Signed-off-by: Sandy Huang --- drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 4 ++-- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 ++-- drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c index 24d4c11ff792..915ededb3b97 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c @@ -1358,10 +1358,10 @@ dw_mipi_dsi_encoder_atomic_check(struct drm_encoder *encoder, s->color_space = V4L2_COLORSPACE_DEFAULT; if (dsi->slave) - s->output_flags |= ROCKCHIP_OUTPUT_DSI_DUAL_CHANNEL; + s->output_flags |= ROCKCHIP_OUTPUT_DUAL_CHANNEL_LEFT_RIGHT_MODE; if (dsi->id) - s->output_flags |= ROCKCHIP_OUTPUT_DSI_DUAL_LINK; + s->output_flags |= ROCKCHIP_OUTPUT_DATA_SWAP; return 0; } diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 36378cb1d619..dd9d2c340559 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -2955,9 +2955,9 @@ static void vop_crtc_atomic_enable(struct drm_crtc *crtc, 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, - !!(s->output_flags & ROCKCHIP_OUTPUT_DSI_DUAL_CHANNEL)); + !!(s->output_flags & ROCKCHIP_OUTPUT_DUAL_CHANNEL_LEFT_RIGHT_MODE)); VOP_CTRL_SET(vop, data01_swap, - !!(s->output_flags & ROCKCHIP_OUTPUT_DSI_DUAL_LINK) || + !!(s->output_flags & ROCKCHIP_OUTPUT_DATA_SWAP) || vop->dual_channel_swap); break; case DRM_MODE_CONNECTOR_DisplayPort: diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h index 633e91181421..4a23c12f8fc6 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h @@ -23,8 +23,9 @@ #define VOP_MAJOR(version) ((version) >> 8) #define VOP_MINOR(version) ((version) & 0xff) -#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) #define AFBDC_FMT_RGB565 0x0 #define AFBDC_FMT_U8U8U8U8 0x5