shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/rockchip: remove DSI special assign

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

Change-Id: I6ede559deee14a0336e4037c709e5a36d4686c4a
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
This commit is contained in:
Sandy Huang
2020-10-20 17:57:32 +08:00
committed by Tao Huang
parent 8dbaff8f54
commit 44a4467552
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/rockchip/dw-mipi-dsi.c
View File

@@ -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;
}

4
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
View File

@@ -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:

5
drivers/gpu/drm/rockchip/rockchip_drm_vop.h
View File

@@ -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