1 files changed, 50 insertions, 17 deletions

diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index 8d02f164c8c6..ec2d132c782d 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -2417,6 +2417,55 @@ static int omapfb_init_connections(struct omapfb2_device *fbdev,
         return 0;
 }
 
+static struct omap_dss_device *
+omapfb_find_default_display(struct omapfb2_device *fbdev)
+{
+        const char *def_name;
+        int i;
+
+        /*
+         * Search with the display name from the user or the board file,
+         * comparing to display names and aliases
+         */
+
+        def_name = omapdss_get_default_display_name();
+
+        if (def_name) {
+                for (i = 0; i < fbdev->num_displays; ++i) {
+                        struct omap_dss_device *dssdev;
+
+                        dssdev = fbdev->displays[i].dssdev;
+
+                        if (dssdev->name && strcmp(def_name, dssdev->name) == 0)
+                                return dssdev;
+
+                        if (strcmp(def_name, dssdev->alias) == 0)
+                                return dssdev;
+                }
+
+                /* def_name given but not found */
+                return NULL;
+        }
+
+        /* then look for DT alias display0 */
+        for (i = 0; i < fbdev->num_displays; ++i) {
+                struct omap_dss_device *dssdev;
+                int id;
+
+                dssdev = fbdev->displays[i].dssdev;
+
+                if (dssdev->dev->of_node == NULL)
+                        continue;
+
+                id = of_alias_get_id(dssdev->dev->of_node, "display");
+                if (id == 0)
+                        return dssdev;
+        }
+
+        /* return the first display we have in the list */
+        return fbdev->displays[0].dssdev;
+}
+
 static int omapfb_probe(struct platform_device *pdev)
 {
         struct omapfb2_device *fbdev = NULL;
@@ -2494,23 +2543,7 @@ static int omapfb_probe(struct platform_device *pdev)
         for (i = 0; i < fbdev->num_managers; i++)
                 fbdev->managers[i] = omap_dss_get_overlay_manager(i);
 
-        def_display = NULL;
-
-        for (i = 0; i < fbdev->num_displays; ++i) {
-                struct omap_dss_device *dssdev;
-                const char *def_name;
-
-                def_name = omapdss_get_default_display_name();
-
-                dssdev = fbdev->displays[i].dssdev;
-
-                if (def_name == NULL ||
-                        (dssdev->name && strcmp(def_name, dssdev->name) == 0)) {
-                        def_display = dssdev;
-                        break;
-                }
-        }
-
+        def_display = omapfb_find_default_display(fbdev);
         if (def_display == NULL) {
                 dev_err(fbdev->dev, "failed to find default display\n");
                 r = -EPROBE_DEFER;