Merge tag 'drm-intel-next-2016-09-19' of git://anongit.freedesktop.org/drm-intel...

[cascardo/linux.git] / drivers / gpu / drm / fsl-dcu / fsl_dcu_drm_rgb.c

diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
index 98c998d..26edcc8 100644 (file)
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
@@ -10,6 +10,7 @@
  */
 
 #include <linux/backlight.h>
+#include <linux/of_graph.h>
 
 #include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
@@ -102,14 +103,6 @@ static const struct drm_connector_funcs fsl_dcu_drm_connector_funcs = {
        .reset = drm_atomic_helper_connector_reset,
 };
 
-static struct drm_encoder *
-fsl_dcu_drm_connector_best_encoder(struct drm_connector *connector)
-{
-       struct fsl_dcu_drm_connector *fsl_con = to_fsl_dcu_connector(connector);
-
-       return fsl_con->encoder;
-}
-
 static int fsl_dcu_drm_connector_get_modes(struct drm_connector *connector)
 {
        struct fsl_dcu_drm_connector *fsl_connector;
@@ -136,17 +129,16 @@ static int fsl_dcu_drm_connector_mode_valid(struct drm_connector *connector,
 }
 
 static const struct drm_connector_helper_funcs connector_helper_funcs = {
-       .best_encoder = fsl_dcu_drm_connector_best_encoder,
        .get_modes = fsl_dcu_drm_connector_get_modes,
        .mode_valid = fsl_dcu_drm_connector_mode_valid,
 };
 
-int fsl_dcu_drm_connector_create(struct fsl_dcu_drm_device *fsl_dev,
-                                struct drm_encoder *encoder)
+static int fsl_dcu_attach_panel(struct fsl_dcu_drm_device *fsl_dev,
+                                struct drm_panel *panel)
 {
+       struct drm_encoder *encoder = &fsl_dev->encoder;
        struct drm_connector *connector = &fsl_dev->connector.base;
        struct drm_mode_config *mode_config = &fsl_dev->drm->mode_config;
-       struct device_node *panel_node;
        int ret;
 
        fsl_dev->connector.encoder = encoder;
@@ -170,21 +162,7 @@ int fsl_dcu_drm_connector_create(struct fsl_dcu_drm_device *fsl_dev,
                                      mode_config->dpms_property,
                                      DRM_MODE_DPMS_OFF);
 
-       panel_node = of_parse_phandle(fsl_dev->np, "fsl,panel", 0);
-       if (!panel_node) {
-               dev_err(fsl_dev->dev, "fsl,panel property not found\n");
-               ret = -ENODEV;
-               goto err_sysfs;
-       }
-
-       fsl_dev->connector.panel = of_drm_find_panel(panel_node);
-       if (!fsl_dev->connector.panel) {
-               ret = -EPROBE_DEFER;
-               goto err_panel;
-       }
-       of_node_put(panel_node);
-
-       ret = drm_panel_attach(fsl_dev->connector.panel, connector);
+       ret = drm_panel_attach(panel, connector);
        if (ret) {
                dev_err(fsl_dev->dev, "failed to attach panel\n");
                goto err_sysfs;
@@ -192,11 +170,62 @@ int fsl_dcu_drm_connector_create(struct fsl_dcu_drm_device *fsl_dev,
 
        return 0;
 
-err_panel:
-       of_node_put(panel_node);
 err_sysfs:
        drm_connector_unregister(connector);
 err_cleanup:
        drm_connector_cleanup(connector);
        return ret;
 }
+
+static int fsl_dcu_attach_endpoint(struct fsl_dcu_drm_device *fsl_dev,
+                                  const struct of_endpoint *ep)
+{
+       struct drm_bridge *bridge;
+       struct device_node *np;
+
+       np = of_graph_get_remote_port_parent(ep->local_node);
+
+       fsl_dev->connector.panel = of_drm_find_panel(np);
+       if (fsl_dev->connector.panel) {
+               of_node_put(np);
+               return fsl_dcu_attach_panel(fsl_dev, fsl_dev->connector.panel);
+       }
+
+       bridge = of_drm_find_bridge(np);
+       of_node_put(np);
+       if (!bridge)
+               return -ENODEV;
+
+       fsl_dev->encoder.bridge = bridge;
+       bridge->encoder = &fsl_dev->encoder;
+
+       return drm_bridge_attach(fsl_dev->drm, bridge);
+}
+
+int fsl_dcu_create_outputs(struct fsl_dcu_drm_device *fsl_dev)
+{
+       struct of_endpoint ep;
+       struct device_node *ep_node, *panel_node;
+       int ret;
+
+       /* This is for backward compatibility */
+       panel_node = of_parse_phandle(fsl_dev->np, "fsl,panel", 0);
+       if (panel_node) {
+               fsl_dev->connector.panel = of_drm_find_panel(panel_node);
+               of_node_put(panel_node);
+               if (!fsl_dev->connector.panel)
+                       return -EPROBE_DEFER;
+               return fsl_dcu_attach_panel(fsl_dev, fsl_dev->connector.panel);
+       }
+
+       ep_node = of_graph_get_next_endpoint(fsl_dev->np, NULL);
+       if (!ep_node)
+               return -ENODEV;
+
+       ret = of_graph_parse_endpoint(ep_node, &ep);
+       of_node_put(ep_node);
+       if (ret)
+               return -ENODEV;
+
+       return fsl_dcu_attach_endpoint(fsl_dev, &ep);
+}