[PATCH v5 2/6] drm: rcar-du: lvds: Improve identification of panels

2019-12-17 Thread Fabrizio Castro
Dual-LVDS panels are mistakenly identified as bridges, this
commit replaces the current logic with a call to
drm_of_find_panel_or_bridge to sort that out.

Signed-off-by: Fabrizio Castro 

---
v4->v5:
* Addressed comments from Laurent's review

v3->v4:
* New patch extracted from patch:
  "drm: rcar-du: lvds: Add dual-LVDS panels support"
---
 drivers/gpu/drm/rcar-du/rcar_lvds.c | 75 +
 1 file changed, 10 insertions(+), 65 deletions(-)

diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c 
b/drivers/gpu/drm/rcar-du/rcar_lvds.c
index b03b7cd..4d038bd 100644
--- a/drivers/gpu/drm/rcar-du/rcar_lvds.c
+++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -716,79 +717,23 @@ static int rcar_lvds_parse_dt_companion(struct rcar_lvds 
*lvds)
 
 static int rcar_lvds_parse_dt(struct rcar_lvds *lvds)
 {
-   struct device_node *local_output = NULL;
-   struct device_node *remote_input = NULL;
-   struct device_node *remote = NULL;
-   struct device_node *node;
-   bool is_bridge = false;
-   int ret = 0;
-
-   local_output = of_graph_get_endpoint_by_regs(lvds->dev->of_node, 1, 0);
-   if (!local_output) {
-   dev_dbg(lvds->dev, "unconnected port@1\n");
-   ret = -ENODEV;
-   goto done;
-   }
-
-   /*
-* Locate the connected entity and infer its type from the number of
-* endpoints.
-*/
-   remote = of_graph_get_remote_port_parent(local_output);
-   if (!remote) {
-   dev_dbg(lvds->dev, "unconnected endpoint %pOF\n", local_output);
-   ret = -ENODEV;
-   goto done;
-   }
+   int ret;
 
-   if (!of_device_is_available(remote)) {
-   dev_dbg(lvds->dev, "connected entity %pOF is disabled\n",
-   remote);
-   ret = -ENODEV;
+   ret = drm_of_find_panel_or_bridge(lvds->dev->of_node, 1, 0,
+ >panel, >next_bridge);
+   if (ret)
goto done;
-   }
 
-   remote_input = of_graph_get_remote_endpoint(local_output);
-
-   for_each_endpoint_of_node(remote, node) {
-   if (node != remote_input) {
-   /*
-* We've found one endpoint other than the input, this
-* must be a bridge.
-*/
-   is_bridge = true;
-   of_node_put(node);
-   break;
-   }
-   }
-
-   if (is_bridge) {
-   lvds->next_bridge = of_drm_find_bridge(remote);
-   if (!lvds->next_bridge) {
-   ret = -EPROBE_DEFER;
-   goto done;
-   }
-
-   if (lvds->info->quirks & RCAR_LVDS_QUIRK_DUAL_LINK)
-   lvds->dual_link = lvds->next_bridge->timings
-   ? lvds->next_bridge->timings->dual_link
-   : false;
-   } else {
-   lvds->panel = of_drm_find_panel(remote);
-   if (IS_ERR(lvds->panel)) {
-   ret = PTR_ERR(lvds->panel);
-   goto done;
-   }
-   }
+   if ((lvds->info->quirks & RCAR_LVDS_QUIRK_DUAL_LINK) &&
+   lvds->next_bridge)
+   lvds->dual_link = lvds->next_bridge->timings
+   ? lvds->next_bridge->timings->dual_link
+   : false;
 
if (lvds->dual_link)
ret = rcar_lvds_parse_dt_companion(lvds);
 
 done:
-   of_node_put(local_output);
-   of_node_put(remote_input);
-   of_node_put(remote);
-
/*
 * On D3/E3 the LVDS encoder provides a clock to the DU, which can be
 * used for the DPAD output even when the LVDS output is not connected.
-- 
2.7.4

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: [PATCH v5 2/6] drm: rcar-du: lvds: Improve identification of panels

2019-12-16 Thread Laurent Pinchart
Hi Fabrizio,

Thank you for the patch.

On Mon, Dec 16, 2019 at 08:12:30PM +, Fabrizio Castro wrote:
> Dual-LVDS panels are mistakenly identified as bridges, this
> commit replaces the current logic with a call to
> drm_of_find_panel_or_bridge to sort that out.
> 
> Signed-off-by: Fabrizio Castro 

Reviewed-by: Laurent Pinchart 

> ---
> v4->v5:
> * Addressed comments from Laurent's review
> 
> v3->v4:
> * New patch extracted from patch:
>   "drm: rcar-du: lvds: Add dual-LVDS panels support"
> ---
>  drivers/gpu/drm/rcar-du/rcar_lvds.c | 75 
> +
>  1 file changed, 10 insertions(+), 65 deletions(-)
> 
> diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c 
> b/drivers/gpu/drm/rcar-du/rcar_lvds.c
> index b03b7cd..4d038bd 100644
> --- a/drivers/gpu/drm/rcar-du/rcar_lvds.c
> +++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c
> @@ -21,6 +21,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
>  #include 
>  #include 
>  
> @@ -716,79 +717,23 @@ static int rcar_lvds_parse_dt_companion(struct 
> rcar_lvds *lvds)
>  
>  static int rcar_lvds_parse_dt(struct rcar_lvds *lvds)
>  {
> - struct device_node *local_output = NULL;
> - struct device_node *remote_input = NULL;
> - struct device_node *remote = NULL;
> - struct device_node *node;
> - bool is_bridge = false;
> - int ret = 0;
> -
> - local_output = of_graph_get_endpoint_by_regs(lvds->dev->of_node, 1, 0);
> - if (!local_output) {
> - dev_dbg(lvds->dev, "unconnected port@1\n");
> - ret = -ENODEV;
> - goto done;
> - }
> -
> - /*
> -  * Locate the connected entity and infer its type from the number of
> -  * endpoints.
> -  */
> - remote = of_graph_get_remote_port_parent(local_output);
> - if (!remote) {
> - dev_dbg(lvds->dev, "unconnected endpoint %pOF\n", local_output);
> - ret = -ENODEV;
> - goto done;
> - }
> + int ret;
>  
> - if (!of_device_is_available(remote)) {
> - dev_dbg(lvds->dev, "connected entity %pOF is disabled\n",
> - remote);
> - ret = -ENODEV;
> + ret = drm_of_find_panel_or_bridge(lvds->dev->of_node, 1, 0,
> +   >panel, >next_bridge);
> + if (ret)
>   goto done;
> - }
>  
> - remote_input = of_graph_get_remote_endpoint(local_output);
> -
> - for_each_endpoint_of_node(remote, node) {
> - if (node != remote_input) {
> - /*
> -  * We've found one endpoint other than the input, this
> -  * must be a bridge.
> -  */
> - is_bridge = true;
> - of_node_put(node);
> - break;
> - }
> - }
> -
> - if (is_bridge) {
> - lvds->next_bridge = of_drm_find_bridge(remote);
> - if (!lvds->next_bridge) {
> - ret = -EPROBE_DEFER;
> - goto done;
> - }
> -
> - if (lvds->info->quirks & RCAR_LVDS_QUIRK_DUAL_LINK)
> - lvds->dual_link = lvds->next_bridge->timings
> - ? lvds->next_bridge->timings->dual_link
> - : false;
> - } else {
> - lvds->panel = of_drm_find_panel(remote);
> - if (IS_ERR(lvds->panel)) {
> - ret = PTR_ERR(lvds->panel);
> - goto done;
> - }
> - }
> + if ((lvds->info->quirks & RCAR_LVDS_QUIRK_DUAL_LINK) &&
> + lvds->next_bridge)
> + lvds->dual_link = lvds->next_bridge->timings
> + ? lvds->next_bridge->timings->dual_link
> + : false;
>  
>   if (lvds->dual_link)
>   ret = rcar_lvds_parse_dt_companion(lvds);
>  
>  done:
> - of_node_put(local_output);
> - of_node_put(remote_input);
> - of_node_put(remote);
> -
>   /*
>* On D3/E3 the LVDS encoder provides a clock to the DU, which can be
>* used for the DPAD output even when the LVDS output is not connected.

-- 
Regards,

Laurent Pinchart
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel