From 27da92ba1d831d8880a7dfa9a2c0637897bb0428 Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Mon, 6 May 2024 11:38:08 +0800 Subject: [PATCH] drm/rockchip: dsi2: normalize for rockchip,dual-connector-split 1. use rockchip,dual-connector-split instead of dual-connector-split; 2. init output_if_left_panel by default. Signed-off-by: Sandy Huang Change-Id: I6de71b42fd2967d03508579188049694aa2e2406 --- drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c index ee38e48554a2..17c8b0dfa550 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c @@ -486,6 +486,8 @@ static void dw_mipi_dsi2_encoder_atomic_disable(struct drm_encoder *encoder, s->output_if &= ~(VOP_OUTPUT_IF_MIPI1 | VOP_OUTPUT_IF_MIPI0); else s->output_if &= ~(dsi2->id ? VOP_OUTPUT_IF_MIPI1 : VOP_OUTPUT_IF_MIPI0); + + s->output_if_left_panel &= ~(dsi2->id ? VOP_OUTPUT_IF_MIPI1 : VOP_OUTPUT_IF_MIPI0); } static void dw_mipi_dsi2_get_lane_rate(struct dw_mipi_dsi2 *dsi2) @@ -1019,6 +1021,8 @@ dw_mipi_dsi2_encoder_atomic_check(struct drm_encoder *encoder, s->output_flags |= ROCKCHIP_OUTPUT_DATA_SWAP; s->output_if |= VOP_OUTPUT_IF_MIPI1; + s->output_if_left_panel |= dsi2->id ? + VOP_OUTPUT_IF_MIPI1 : VOP_OUTPUT_IF_MIPI0; } if (dsi2->dual_connector_split) { @@ -1737,10 +1741,10 @@ static int dw_mipi_dsi2_probe(struct platform_device *pdev) if (device_property_read_bool(dev, "disable-hold-mode")) dsi2->disable_hold_mode = true; - if (device_property_read_bool(dev, "dual-connector-split")) { + if (device_property_read_bool(dev, "rockchip,dual-connector-split")) { dsi2->dual_connector_split = true; - if (device_property_read_bool(dev, "left-display")) + if (device_property_read_bool(dev, "rockchip,left-display")) dsi2->left_display = true; }