]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/arcpgu: rework encoder search
authorEugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
Tue, 11 Jun 2019 17:21:59 +0000 (20:21 +0300)
committerAlexey Brodkin <abrodkin@synopsys.com>
Wed, 17 Jul 2019 20:36:56 +0000 (23:36 +0300)
Instead of using non-standard "encoder-slave" property to find
encoder let's find it by associated endpoint.

While I'm on it add corresponding log message if we don't find
any encoder and we assume that we use virtual LCD on the
simulation platform.

Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
drivers/gpu/drm/arc/arcpgu_drv.c

index af60c6d7a5f4a40aae09d6808031e45167aa31d9..cf40e3ab04a5393617816fd685ad0f9c60ac73c7 100644 (file)
@@ -14,6 +14,7 @@
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
+#include <drm/drm_of.h>
 #include <drm/drm_probe_helper.h>
 #include <linux/dma-mapping.h>
 #include <linux/module.h>
@@ -45,7 +46,7 @@ static int arcpgu_load(struct drm_device *drm)
 {
        struct platform_device *pdev = to_platform_device(drm->dev);
        struct arcpgu_drm_private *arcpgu;
-       struct device_node *encoder_node;
+       struct device_node *encoder_node = NULL, *endpoint_node = NULL;
        struct resource *res;
        int ret;
 
@@ -80,14 +81,23 @@ static int arcpgu_load(struct drm_device *drm)
        if (arc_pgu_setup_crtc(drm) < 0)
                return -ENODEV;
 
-       /* find the encoder node and initialize it */
-       encoder_node = of_parse_phandle(drm->dev->of_node, "encoder-slave", 0);
+       /*
+        * There is only one output port inside each device. It is linked with
+        * encoder endpoint.
+        */
+       endpoint_node = of_graph_get_next_endpoint(pdev->dev.of_node, NULL);
+       if (endpoint_node) {
+               encoder_node = of_graph_get_remote_port_parent(endpoint_node);
+               of_node_put(endpoint_node);
+       }
+
        if (encoder_node) {
                ret = arcpgu_drm_hdmi_init(drm, encoder_node);
                of_node_put(encoder_node);
                if (ret < 0)
                        return ret;
        } else {
+               dev_info(drm->dev, "no encoder found. Assumed virtual LCD on simulation platform\n");
                ret = arcpgu_drm_sim_init(drm, NULL);
                if (ret < 0)
                        return ret;