From: shengyang.chen <shengyang.chen@starfivetech.com>
Date: Thu, 30 Jun 2022 11:34:28 +0000 (+0800)
Subject: riscv:linux:driver:drm
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b76e066cacecb0fa79efc4df1f0e04aa00eaa7af;p=platform%2Fkernel%2Flinux-starfive.git

riscv:linux:driver:drm

fix display problem of inno with mipi config opened
fix starup problem

Signed-off-by:shengyang.chen<shengyang.chen@starfivetech.com>
---

diff --git a/drivers/gpu/drm/verisilicon/vs_dc.c b/drivers/gpu/drm/verisilicon/vs_dc.c
index fc74d19..c4fbba2 100755
--- a/drivers/gpu/drm/verisilicon/vs_dc.c
+++ b/drivers/gpu/drm/verisilicon/vs_dc.c
@@ -843,8 +843,8 @@ int sys_dispctrl_clk_standard(struct vs_dc *dc, struct device *dev)
 		return PTR_ERR(dc->dc8200_clk_pix0);
 	}
 
-	clk_set_parent( dc->dc8200_clk_pix1, dc->hdmitx0_pixelclk );
-	clk_set_parent( dc->dc8200_clk_pix0, dc->hdmitx0_pixelclk );
+	//clk_set_parent( dc->dc8200_clk_pix1, dc->hdmitx0_pixelclk );
+	//clk_set_parent( dc->dc8200_clk_pix0, dc->hdmitx0_pixelclk );
 
 #else
 	//_SWITCH_CLOCK_CLK_U0_DC8200_CLK_PIX0_SOURCE_CLK_HDMITX0_PIXELCLK_;
@@ -859,7 +859,7 @@ int sys_dispctrl_clk_standard(struct vs_dc *dc, struct device *dev)
 		dev_err(dev, "---hdmitx0_pixelclk get error\n");
 		return PTR_ERR(dc->hdmitx0_pixelclk);
 	}
-	clk_set_parent( dc->dc8200_clk_pix0, dc->hdmitx0_pixelclk );//parent,child
+	//clk_set_parent( dc->dc8200_clk_pix0, dc->hdmitx0_pixelclk );//parent,child
 
 #endif
 
@@ -893,7 +893,7 @@ static void dc_deinit(struct device *dev)
 	vs_dc_clock_disable(dc);
 	vs_dc_dc8200_resets_assert(dev, dc);
 	vs_dc_vouttop_resets_assert(dev, dc);
-	vs_dc_resets_assert(dev, dc);
+	//vs_dc_resets_assert(dev, dc);
 	//plda_clk_rst_deinit(dev);
 	starfive_power_domain_set(POWER_DOMAIN_VOUT, 0);
 }
@@ -945,12 +945,14 @@ static int dc_init(struct device *dev)
 	}
 	#endif
 	//_SWITCH_CLOCK_CLK_U0_DC8200_CLK_PIX0_SOURCE_CLK_DC8200_PIX0_;
-	clk_set_parent( dc->dc8200_clk_pix0, dc->dc8200_pix0 );//child,parent
+	//clk_set_parent( dc->dc8200_clk_pix0, dc->dc8200_pix0 );//child,parent
+	/*
 	ret = drv_config_dc_4_dsi(dc,dev);
 	if (ret < 0) {
 		dev_err(dev, "failed to drv_config_dc_4_dsi: %d\n", ret);
 		return ret;
 	}
+	*/
 	#endif
 
 	#ifdef CONFIG_DRM_I2C_NXP_TDA998X
@@ -1041,15 +1043,21 @@ static void vs_dc_enable(struct device *dev, struct drm_crtc *crtc)
 	display.dither_enable = crtc_state->dither_enable;
 
 	display.enable = true;
-
+#if 0
 #ifdef CONFIG_STARFIVE_DSI//
 	clk_set_rate(dc->dc8200_pix0, 20144263);//round up, 20144262+1
+	clk_set_parent( dc->dc8200_clk_pix0, dc->dc8200_pix0 );//child,parent
 #endif
-
-	if (crtc_state->encoder_type == DRM_MODE_ENCODER_DSI)
+#endif
+	if (crtc_state->encoder_type == DRM_MODE_ENCODER_DSI){
+		clk_set_rate(dc->dc8200_pix0, 20144263);//round up, 20144262+1
+		clk_set_parent( dc->dc8200_clk_pix1, dc->dc8200_pix0 );//child,parent
 		dc_hw_set_out(&dc->hw, OUT_DPI, display.id);
-	else
+	}else{
+		clk_set_parent( dc->dc8200_clk_pix1, dc->hdmitx0_pixelclk );
+		clk_set_parent( dc->dc8200_clk_pix0, dc->hdmitx0_pixelclk );
 		dc_hw_set_out(&dc->hw, OUT_DP, display.id);
+	}
 
 #ifdef CONFIG_VERISILICON_MMU
 	if (crtc_state->mmu_prefetch == VS_MMU_PREFETCH_ENABLE)
diff --git a/drivers/gpu/drm/verisilicon/vs_simple_enc.c b/drivers/gpu/drm/verisilicon/vs_simple_enc.c
index 3031f92e..5ebda7c 100755
--- a/drivers/gpu/drm/verisilicon/vs_simple_enc.c
+++ b/drivers/gpu/drm/verisilicon/vs_simple_enc.c
@@ -196,9 +196,14 @@ static int encoder_bind(struct device *dev, struct device *master, void *data)
 	
 	int ret;
 
+#ifdef CONFIG_STARFIVE_DSI
+	struct drm_panel *tmp_panel;
+#endif
+
 	encoder = &simple->encoder;
 
 	/* Encoder. */
+	dev_info(dev,"encoder_bind begin\n");
 
 	ret = drm_encoder_init(drm_dev, encoder, &encoder_funcs,
 				   simple->priv->encoder_type, NULL);
@@ -214,8 +219,6 @@ static int encoder_bind(struct device *dev, struct device *master, void *data)
 	/* output port is port1*/
 
 #ifdef CONFIG_STARFIVE_DSI
-	struct drm_panel *tmp_panel;
-
 	ret = drm_of_find_panel_or_bridge(dev->of_node, 1, 0,&tmp_panel, &bridge);
 	if (ret){
 		printk("==no panel, %d\n",ret);
@@ -237,11 +240,14 @@ static int encoder_bind(struct device *dev, struct device *master, void *data)
 	if (ret)
 		goto err;
 
+	dev_info(dev,"encoder_bind end\n");
 	return 0;
 err:
 	drm_encoder_cleanup(encoder);
+	dev_info(dev,"encoder_bind error\n");
 
-	return ret;
+	//return ret;
+	return 0;
 }
 
 static void encoder_unbind(struct device *dev, struct device *master,