Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/rockchip: Correct vop out_mode configure

Force vop output mode on encoder driver seem not a good idea,

EDP, HDMI, DisplayPort all have 10bit input on rk3399,
On non-10bit vop, vop 8bit output bit[0-7] connect to the
encoder high 8bit [2-9].

So force RGB10 to RGB888 on vop driver would be better.

And another problem, EDP check crtc id on atomic_check,
but encoder maybe NULL, so out_mode configure would fail,
it cause edp no display.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Reviewed-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1495885416-22216-1-git-send-email-mark.yao@rock-chips.com

Mark yao efd11cc8 82bc9a42

+15 -19
-12
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
··· 245 245 struct drm_connector_state *conn_state) 246 246 { 247 247 struct rockchip_crtc_state *s = to_rockchip_crtc_state(crtc_state); 248 - struct rockchip_dp_device *dp = to_dp(encoder); 249 - int ret; 250 248 251 249 /* 252 250 * The hardware IC designed that VOP must output the RGB10 video ··· 256 258 257 259 s->output_mode = ROCKCHIP_OUT_MODE_AAAA; 258 260 s->output_type = DRM_MODE_CONNECTOR_eDP; 259 - if (dp->data->chip_type == RK3399_EDP) { 260 - /* 261 - * For RK3399, VOP Lit must code the out mode to RGB888, 262 - * VOP Big must code the out mode to RGB10. 263 - */ 264 - ret = drm_of_encoder_active_endpoint_id(dp->dev->of_node, 265 - encoder); 266 - if (ret > 0) 267 - s->output_mode = ROCKCHIP_OUT_MODE_P888; 268 - } 269 261 270 262 return 0; 271 263 }
+2 -7
drivers/gpu/drm/rockchip/cdn-dp-core.c
··· 615 615 { 616 616 struct cdn_dp_device *dp = encoder_to_dp(encoder); 617 617 int ret, val; 618 - struct rockchip_crtc_state *state; 619 618 620 619 ret = drm_of_encoder_active_endpoint_id(dp->dev->of_node, encoder); 621 620 if (ret < 0) { ··· 624 625 625 626 DRM_DEV_DEBUG_KMS(dp->dev, "vop %s output to cdn-dp\n", 626 627 (ret) ? "LIT" : "BIG"); 627 - state = to_rockchip_crtc_state(encoder->crtc->state); 628 - if (ret) { 628 + if (ret) 629 629 val = DP_SEL_VOP_LIT | (DP_SEL_VOP_LIT << 16); 630 - state->output_mode = ROCKCHIP_OUT_MODE_P888; 631 - } else { 630 + else 632 631 val = DP_SEL_VOP_LIT << 16; 633 - state->output_mode = ROCKCHIP_OUT_MODE_AAAA; 634 - } 635 632 636 633 ret = cdn_dp_grf_write(dp, GRF_SOC_CON9, val); 637 634 if (ret)
+8
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
··· 875 875 static void vop_crtc_enable(struct drm_crtc *crtc) 876 876 { 877 877 struct vop *vop = to_vop(crtc); 878 + const struct vop_data *vop_data = vop->data; 878 879 struct rockchip_crtc_state *s = to_rockchip_crtc_state(crtc->state); 879 880 struct drm_display_mode *adjusted_mode = &crtc->state->adjusted_mode; 880 881 u16 hsync_len = adjusted_mode->hsync_end - adjusted_mode->hsync_start; ··· 968 967 DRM_DEV_ERROR(vop->dev, "unsupported connector_type [%d]\n", 969 968 s->output_type); 970 969 } 970 + 971 + /* 972 + * if vop is not support RGB10 output, need force RGB10 to RGB888. 973 + */ 974 + if (s->output_mode == ROCKCHIP_OUT_MODE_AAAA && 975 + !(vop_data->feature & VOP_FEATURE_OUTPUT_RGB10)) 976 + s->output_mode = ROCKCHIP_OUT_MODE_P888; 971 977 VOP_CTRL_SET(vop, out_mode, s->output_mode); 972 978 973 979 VOP_CTRL_SET(vop, htotal_pw, (htotal << 16) | hsync_len);
+3
drivers/gpu/drm/rockchip/rockchip_drm_vop.h
··· 142 142 const struct vop_intr *intr; 143 143 const struct vop_win_data *win; 144 144 unsigned int win_size; 145 + 146 + #define VOP_FEATURE_OUTPUT_RGB10 BIT(0) 147 + u64 feature; 145 148 }; 146 149 147 150 /* interrupt define */
+2
drivers/gpu/drm/rockchip/rockchip_vop_reg.c
··· 275 275 static const struct vop_data rk3288_vop = { 276 276 .init_table = rk3288_init_reg_table, 277 277 .table_size = ARRAY_SIZE(rk3288_init_reg_table), 278 + .feature = VOP_FEATURE_OUTPUT_RGB10, 278 279 .intr = &rk3288_vop_intr, 279 280 .ctrl = &rk3288_ctrl_data, 280 281 .win = rk3288_vop_win_data, ··· 344 343 static const struct vop_data rk3399_vop_big = { 345 344 .init_table = rk3399_init_reg_table, 346 345 .table_size = ARRAY_SIZE(rk3399_init_reg_table), 346 + .feature = VOP_FEATURE_OUTPUT_RGB10, 347 347 .intr = &rk3399_vop_intr, 348 348 .ctrl = &rk3399_ctrl_data, 349 349 /*