Skip to contentSkip to conversation

drm/bridge/synopsys: dsi: add optional pixel clock

PATCH In review Philippe Cornu 2 participants 6 messages Jan 23, 2018 – Jan 25, 2018

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 drm/bridge/synopsys: dsi: add optional pixel clock

The pixel clock is optional. When available, it offers a better preciseness for timing computations and allows to reduce the extra dsi bandwidth in burst mode (from ~20% to ~10-12%, hw platform dependant).

---
Changes in v3: Simplify px_clk probing thanks to Andrzej Hajda comments

Changes in v2: Improve px_clk probing in case of ENOENT dt returned value (thanks to Philipp Zabel & Andrzej Hajda comments)

 drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +19 -6
index ed8af32f8e52..9fb35385c348 100644
@@ -217,6 +217,7 @@ struct dw_mipi_dsi {
 	void __iomem *base;
 
 	struct clk *pclk;
+	struct clk *px_clk;
 
 	unsigned int lane_mbps; /* per lane */
 	u32 channel;
@@ -703,24 +704,28 @@ static void dw_mipi_dsi_bridge_mode_set(struct drm_bridge *bridge,
 	struct dw_mipi_dsi *dsi = bridge_to_dsi(bridge);
 	const struct dw_mipi_dsi_phy_ops *phy_ops = dsi->plat_data->phy_ops;
 	void *priv_data = dsi->plat_data->priv_data;
+	struct drm_display_mode px_clk_mode = *mode;
 	int ret;
 
 	clk_prepare_enable(dsi->pclk);
 
-	ret = phy_ops->get_lane_mbps(priv_data, mode, dsi->mode_flags,
+	if (dsi->px_clk)
+		px_clk_mode.clock = clk_get_rate(dsi->px_clk) / 1000;
+
+	ret = phy_ops->get_lane_mbps(priv_data, &px_clk_mode, dsi->mode_flags,
 				     dsi->lanes, dsi->format, &dsi->lane_mbps);
 	if (ret)
 		DRM_DEBUG_DRIVER("Phy get_lane_mbps() failed\n");
 
 	pm_runtime_get_sync(dsi->dev);
 	dw_mipi_dsi_init(dsi);
-	dw_mipi_dsi_dpi_config(dsi, mode);
+	dw_mipi_dsi_dpi_config(dsi, &px_clk_mode);
 	dw_mipi_dsi_packet_handler_config(dsi);
 	dw_mipi_dsi_video_mode_config(dsi);
-	dw_mipi_dsi_video_packet_config(dsi, mode);
+	dw_mipi_dsi_video_packet_config(dsi, &px_clk_mode);
 	dw_mipi_dsi_command_mode_config(dsi);
-	dw_mipi_dsi_line_timer_config(dsi, mode);
-	dw_mipi_dsi_vertical_timing_config(dsi, mode);
+	dw_mipi_dsi_line_timer_config(dsi, &px_clk_mode);
+	dw_mipi_dsi_vertical_timing_config(dsi, &px_clk_mode);
 
 	dw_mipi_dsi_dphy_init(dsi);
 	dw_mipi_dsi_dphy_timing_config(dsi);
@@ -734,7 +739,7 @@ static void dw_mipi_dsi_bridge_mode_set(struct drm_bridge *bridge,
 
 	dw_mipi_dsi_dphy_enable(dsi);
 
-	dw_mipi_dsi_wait_for_two_frames(mode);
+	dw_mipi_dsi_wait_for_two_frames(&px_clk_mode);
 
 	/* Switch to cmd mode for panel-bridge pre_enable & panel prepare */
 	dw_mipi_dsi_set_mode(dsi, 0);
@@ -828,6 +833,14 @@ __dw_mipi_dsi_probe(struct platform_device *pdev,
 		return ERR_PTR(ret);
 	}
 
+	dsi->px_clk = devm_clk_get(dev, "px_clk");
+	if (IS_ERR(dsi->px_clk)) {
+		ret = PTR_ERR(dsi->px_clk);
+		if (ret != ENOENT)
+			dev_err(dev, "Unable to get opt. px_clk: %d\n", ret);
+		dsi->px_clk = NULL;
+	}
+
 	/*
 	 * Note that the reset was not defined in the initial device tree, so
 	 * we have to be prepared for it not being found.
Signature · 1 line
2.15.1
#1 lore raw

Hi,

Philippe asked me to review the last version. I'm not sure I have a lot to contribute. Maybe Rockchip folks who wrote this stuff in the first place might. I've CC'd some.

Quoted 71 lines · Philippe Cornu

The pixel clock is optional. When available, it offers a better preciseness for timing computations and allows to reduce the extra dsi bandwidth in burst mode (from ~20% to ~10-12%, hw platform dependant).

---
Changes in v3: Simplify px_clk probing thanks to Andrzej Hajda comments

Changes in v2: Improve px_clk probing in case of ENOENT dt returned value (thanks to Philipp Zabel & Andrzej Hajda comments)

 drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +11 -6
index ed8af32f8e52..9fb35385c348 100644
@@ -217,6 +217,7 @@ struct dw_mipi_dsi {
 	void __iomem *base;
 
 	struct clk *pclk;
+	struct clk *px_clk;
 
 	unsigned int lane_mbps; /* per lane */
 	u32 channel;
@@ -703,24 +704,28 @@ static void dw_mipi_dsi_bridge_mode_set(struct drm_bridge *bridge,
 	struct dw_mipi_dsi *dsi = bridge_to_dsi(bridge);
 	const struct dw_mipi_dsi_phy_ops *phy_ops = dsi->plat_data->phy_ops;
 	void *priv_data = dsi->plat_data->priv_data;
+	struct drm_display_mode px_clk_mode = *mode;
 	int ret;
 
 	clk_prepare_enable(dsi->pclk);
 
-	ret = phy_ops->get_lane_mbps(priv_data, mode, dsi->mode_flags,
+	if (dsi->px_clk)
+		px_clk_mode.clock = clk_get_rate(dsi->px_clk) / 1000;
+
+	ret = phy_ops->get_lane_mbps(priv_data, &px_clk_mode, dsi->mode_flags,
 				     dsi->lanes, dsi->format, &dsi->lane_mbps);
 	if (ret)
 		DRM_DEBUG_DRIVER("Phy get_lane_mbps() failed\n");
 
 	pm_runtime_get_sync(dsi->dev);
 	dw_mipi_dsi_init(dsi);
-	dw_mipi_dsi_dpi_config(dsi, mode);
+	dw_mipi_dsi_dpi_config(dsi, &px_clk_mode);
 	dw_mipi_dsi_packet_handler_config(dsi);
 	dw_mipi_dsi_video_mode_config(dsi);
-	dw_mipi_dsi_video_packet_config(dsi, mode);
+	dw_mipi_dsi_video_packet_config(dsi, &px_clk_mode);
 	dw_mipi_dsi_command_mode_config(dsi);
-	dw_mipi_dsi_line_timer_config(dsi, mode);
-	dw_mipi_dsi_vertical_timing_config(dsi, mode);
+	dw_mipi_dsi_line_timer_config(dsi, &px_clk_mode);
+	dw_mipi_dsi_vertical_timing_config(dsi, &px_clk_mode);
 
 	dw_mipi_dsi_dphy_init(dsi);
 	dw_mipi_dsi_dphy_timing_config(dsi);
@@ -734,7 +739,7 @@ static void dw_mipi_dsi_bridge_mode_set(struct drm_bridge *bridge,
 
 	dw_mipi_dsi_dphy_enable(dsi);
 
-	dw_mipi_dsi_wait_for_two_frames(mode);
+	dw_mipi_dsi_wait_for_two_frames(&px_clk_mode);
 
 	/* Switch to cmd mode for panel-bridge pre_enable & panel prepare */
 	dw_mipi_dsi_set_mode(dsi, 0);

drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c __dw_mipi_dsi_probe(struct platform_device *pdev, · line 836

Quoted 4 lines
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +1 -0
@@ -828,6 +833,14 @@ __dw_mipi_dsi_probe(struct platform_device *pdev,
 		return ERR_PTR(ret);
 	}
 
+	dsi->px_clk = devm_clk_get(dev, "px_clk");

Did you write a device tree binding document update for this anywhere?

Brian

Quoted 13 lines
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +7 -0
+	if (IS_ERR(dsi->px_clk)) {
+		ret = PTR_ERR(dsi->px_clk);
+		if (ret != ENOENT)
+			dev_err(dev, "Unable to get opt. px_clk: %d\n", ret);
+		dsi->px_clk = NULL;
+	}
+
 	/*
 	 * Note that the reset was not defined in the initial device tree, so
 	 * we have to be prepared for it not being found.
Signature · 1 line
2.15.1
#2 lore raw

Hi Brian,

Quoted 81 lines · Brian Norris

Hi,

Philippe asked me to review the last version. I'm not sure I have a lot to contribute. Maybe Rockchip folks who wrote this stuff in the first place might. I've CC'd some.

Quoted 74 lines · Philippe Cornu

The pixel clock is optional. When available, it offers a better preciseness for timing computations and allows to reduce the extra dsi bandwidth in burst mode (from ~20% to ~10-12%, hw platform dependant).

---
Changes in v3: Simplify px_clk probing thanks to Andrzej Hajda comments

Changes in v2: Improve px_clk probing in case of ENOENT dt returned value (thanks to Philipp Zabel & Andrzej Hajda comments)

  drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 25 +++++++++++++++++++------
  1 file changed, 19 insertions(+), 6 deletions(-)
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +11 -6
index ed8af32f8e52..9fb35385c348 100644
@@ -217,6 +217,7 @@ struct dw_mipi_dsi {
  	void __iomem *base;
 
  	struct clk *pclk;
+	struct clk *px_clk;
 
  	unsigned int lane_mbps; /* per lane */
  	u32 channel;
@@ -703,24 +704,28 @@ static void dw_mipi_dsi_bridge_mode_set(struct drm_bridge *bridge,
  	struct dw_mipi_dsi *dsi = bridge_to_dsi(bridge);
  	const struct dw_mipi_dsi_phy_ops *phy_ops = dsi->plat_data->phy_ops;
  	void *priv_data = dsi->plat_data->priv_data;
+	struct drm_display_mode px_clk_mode = *mode;
  	int ret;
 
  	clk_prepare_enable(dsi->pclk);
 
-	ret = phy_ops->get_lane_mbps(priv_data, mode, dsi->mode_flags,
+	if (dsi->px_clk)
+		px_clk_mode.clock = clk_get_rate(dsi->px_clk) / 1000;
+
+	ret = phy_ops->get_lane_mbps(priv_data, &px_clk_mode, dsi->mode_flags,
  				     dsi->lanes, dsi->format, &dsi->lane_mbps);
  	if (ret)
  		DRM_DEBUG_DRIVER("Phy get_lane_mbps() failed\n");
 
  	pm_runtime_get_sync(dsi->dev);
  	dw_mipi_dsi_init(dsi);
-	dw_mipi_dsi_dpi_config(dsi, mode);
+	dw_mipi_dsi_dpi_config(dsi, &px_clk_mode);
  	dw_mipi_dsi_packet_handler_config(dsi);
  	dw_mipi_dsi_video_mode_config(dsi);
-	dw_mipi_dsi_video_packet_config(dsi, mode);
+	dw_mipi_dsi_video_packet_config(dsi, &px_clk_mode);
  	dw_mipi_dsi_command_mode_config(dsi);
-	dw_mipi_dsi_line_timer_config(dsi, mode);
-	dw_mipi_dsi_vertical_timing_config(dsi, mode);
+	dw_mipi_dsi_line_timer_config(dsi, &px_clk_mode);
+	dw_mipi_dsi_vertical_timing_config(dsi, &px_clk_mode);
 
  	dw_mipi_dsi_dphy_init(dsi);
  	dw_mipi_dsi_dphy_timing_config(dsi);
@@ -734,7 +739,7 @@ static void dw_mipi_dsi_bridge_mode_set(struct drm_bridge *bridge,
 
  	dw_mipi_dsi_dphy_enable(dsi);
 
-	dw_mipi_dsi_wait_for_two_frames(mode);
+	dw_mipi_dsi_wait_for_two_frames(&px_clk_mode);
 
  	/* Switch to cmd mode for panel-bridge pre_enable & panel prepare */
  	dw_mipi_dsi_set_mode(dsi, 0);
@@ -828,6 +833,14 @@ __dw_mipi_dsi_probe(struct platform_device *pdev,
  		return ERR_PTR(ret);
  	}
 
Quoted 6 lines

drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c __dw_mipi_dsi_probe(struct platform_device *pdev, · line 836

Quoted 1 line
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +1 -0
+	dsi->px_clk = devm_clk_get(dev, "px_clk");

Did you write a device tree binding document update for this anywhere?

Brian

Many thanks for your review,

yes, "px_clk" is already documented, please have a look to Documentation/devicetree/bindings/display/bridge/dw_mipi_dsi.txt

Philippe :-)

Quoted 13 lines
Quoted 13 lines
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +7 -0
+	if (IS_ERR(dsi->px_clk)) {
+		ret = PTR_ERR(dsi->px_clk);
+		if (ret != ENOENT)
+			dev_err(dev, "Unable to get opt. px_clk: %d\n", ret);
+		dsi->px_clk = NULL;
+	}
+
  	/*
  	 * Note that the reset was not defined in the initial device tree, so
  	 * we have to be prepared for it not being found.
Signature · 1 line
2.15.1
Reviewed-by
#3 lore raw
Quoted 9 lines · Philippe CORNU
Quoted 8 lines · Brian Norris
Quoted 7 lines · Philippe Cornu
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +0 -0
@@ -828,6 +833,14 @@ __dw_mipi_dsi_probe(struct platform_device *pdev,
  		return ERR_PTR(ret);
  	}
 
Quoted 8 lines
Quoted 3 lines

drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c __dw_mipi_dsi_probe(struct platform_device *pdev, · line 836

Quoted 1 line
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +1 -0
+	dsi->px_clk = devm_clk_get(dev, "px_clk");

Did you write a device tree binding document update for this anywhere?

Many thanks for your review,

yes, "px_clk" is already documented, please have a look to Documentation/devicetree/bindings/display/bridge/dw_mipi_dsi.txt

Ah, I see. Normally I expect that the binding document is sent around when the first user of it shows up, but I guess that's not a requirement. Sorry I missed that!

Just a note: I don't think that Rockchip systems have an equivalent clock from which to directly derive the pixel clock rate. I believe it's controlled through additional dividers that are not part of the common clock framework. So this isn't particularly useful for them.

I don't think it's worth very much in this case, but:

#4 lore raw

Hi Brian,

Quoted 23 lines · Brian Norris
Quoted 9 lines · Philippe CORNU
Quoted 8 lines · Brian Norris
Quoted 7 lines · Philippe Cornu
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +0 -0
@@ -828,6 +833,14 @@ __dw_mipi_dsi_probe(struct platform_device *pdev,
   		return ERR_PTR(ret);
   	}
 
Quoted 8 lines
Quoted 3 lines

drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c __dw_mipi_dsi_probe(struct platform_device *pdev, · line 836

Quoted 1 line
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +1 -0
+	dsi->px_clk = devm_clk_get(dev, "px_clk");

Did you write a device tree binding document update for this anywhere?

Many thanks for your review,

yes, "px_clk" is already documented, please have a look to Documentation/devicetree/bindings/display/bridge/dw_mipi_dsi.txt

Ah, I see. Normally I expect that the binding document is sent around when the first user of it shows up, but I guess that's not a requirement. Sorry I missed that!

Quoted 9 lines

Just a note: I don't think that Rockchip systems have an equivalent clock from which to directly derive the pixel clock rate. I believe it's controlled through additional dividers that are not part of the common clock framework. So this isn't particularly useful for them.

I don't think it's worth very much in this case, but:

Many thanks for the review and your comments.

Looking more deeply into the rockchip vop driver (in order to understand how the px clock is used), I can see that adjusted_mode/mode_fixup is (now) used.

I have already tried to use adjusted_mode/mode_fixup on stm32 but without success.

Nevertheless, I will do more tests with adjusted_mode/mode_fixup as it could help to have a simpler patch than adding the px_clk.

Many thanks,
Philippe :-)

#5 lore raw
In reply to Philippe Cornu

Hi,

in short: this patch is "CANCELLED" : )

Thanks to comments from some of you, I managed to use adjusted_mode.

Please have a look to the patch "drm/bridge/synopsys: dsi: use adjusted_mode in mode_set".

Hope it is better, comments are welcome

Many thanks,
Philippe :-)

Quoted 86 lines · Philippe Cornu

The pixel clock is optional. When available, it offers a better preciseness for timing computations and allows to reduce the extra dsi bandwidth in burst mode (from ~20% to ~10-12%, hw platform dependant).

---
Changes in v3: Simplify px_clk probing thanks to Andrzej Hajda comments

Changes in v2: Improve px_clk probing in case of ENOENT dt returned value (thanks to Philipp Zabel & Andrzej Hajda comments)

  drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 25 +++++++++++++++++++------
  1 file changed, 19 insertions(+), 6 deletions(-)
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +19 -6
index ed8af32f8e52..9fb35385c348 100644
@@ -217,6 +217,7 @@ struct dw_mipi_dsi {
  	void __iomem *base;
 
  	struct clk *pclk;
+	struct clk *px_clk;
 
  	unsigned int lane_mbps; /* per lane */
  	u32 channel;
@@ -703,24 +704,28 @@ static void dw_mipi_dsi_bridge_mode_set(struct drm_bridge *bridge,
  	struct dw_mipi_dsi *dsi = bridge_to_dsi(bridge);
  	const struct dw_mipi_dsi_phy_ops *phy_ops = dsi->plat_data->phy_ops;
  	void *priv_data = dsi->plat_data->priv_data;
+	struct drm_display_mode px_clk_mode = *mode;
  	int ret;
 
  	clk_prepare_enable(dsi->pclk);
 
-	ret = phy_ops->get_lane_mbps(priv_data, mode, dsi->mode_flags,
+	if (dsi->px_clk)
+		px_clk_mode.clock = clk_get_rate(dsi->px_clk) / 1000;
+
+	ret = phy_ops->get_lane_mbps(priv_data, &px_clk_mode, dsi->mode_flags,
  				     dsi->lanes, dsi->format, &dsi->lane_mbps);
  	if (ret)
  		DRM_DEBUG_DRIVER("Phy get_lane_mbps() failed\n");
 
  	pm_runtime_get_sync(dsi->dev);
  	dw_mipi_dsi_init(dsi);
-	dw_mipi_dsi_dpi_config(dsi, mode);
+	dw_mipi_dsi_dpi_config(dsi, &px_clk_mode);
  	dw_mipi_dsi_packet_handler_config(dsi);
  	dw_mipi_dsi_video_mode_config(dsi);
-	dw_mipi_dsi_video_packet_config(dsi, mode);
+	dw_mipi_dsi_video_packet_config(dsi, &px_clk_mode);
  	dw_mipi_dsi_command_mode_config(dsi);
-	dw_mipi_dsi_line_timer_config(dsi, mode);
-	dw_mipi_dsi_vertical_timing_config(dsi, mode);
+	dw_mipi_dsi_line_timer_config(dsi, &px_clk_mode);
+	dw_mipi_dsi_vertical_timing_config(dsi, &px_clk_mode);
 
  	dw_mipi_dsi_dphy_init(dsi);
  	dw_mipi_dsi_dphy_timing_config(dsi);
@@ -734,7 +739,7 @@ static void dw_mipi_dsi_bridge_mode_set(struct drm_bridge *bridge,
 
  	dw_mipi_dsi_dphy_enable(dsi);
 
-	dw_mipi_dsi_wait_for_two_frames(mode);
+	dw_mipi_dsi_wait_for_two_frames(&px_clk_mode);
 
  	/* Switch to cmd mode for panel-bridge pre_enable & panel prepare */
  	dw_mipi_dsi_set_mode(dsi, 0);
@@ -828,6 +833,14 @@ __dw_mipi_dsi_probe(struct platform_device *pdev,
  		return ERR_PTR(ret);
  	}
 
+	dsi->px_clk = devm_clk_get(dev, "px_clk");
+	if (IS_ERR(dsi->px_clk)) {
+		ret = PTR_ERR(dsi->px_clk);
+		if (ret != ENOENT)
+			dev_err(dev, "Unable to get opt. px_clk: %d\n", ret);
+		dsi->px_clk = NULL;
+	}
+
  	/*
  	 * Note that the reset was not defined in the initial device tree, so
  	 * we have to be prepared for it not being found.