OMAPFB: connect ovl managers to all dssdevs

Commit 5d89bcc341771d95e3a2996218e5949a6627f59e (OMAPDSS: remove initial
display code from omapdss) moved setting up the initial overlay, overlay
manager, output and display connections from omapdss to omapfb.

However, currently omapfb only handles the connection related to the
default display, which means that no overlay managers are connected to
other displays.

This patch changes omapfb to go through all dssdevs, and connect an
overlay manager to them.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index c2dbfb832a07239e995b8729f05e2177aa6e4443..1f60741a7886450a2d1232c3d7217344b2944051 100644 (file)
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -2349,27 +2349,37 @@ static int omapfb_init_display(struct omapfb2_device *fbdev,
 }
 
 static int omapfb_init_connections(struct omapfb2_device *fbdev,
-               struct omap_dss_device *dssdev)
+               struct omap_dss_device *def_dssdev)
 {
        int i, r;
-       struct omap_overlay_manager *mgr = NULL;
+       struct omap_overlay_manager *mgr;
 
-       for (i = 0; i < fbdev->num_managers; i++) {
-               mgr = fbdev->managers[i];
-
-               if (dssdev->channel == mgr->id)
-                       break;
+       if (!def_dssdev->output) {
+               dev_err(fbdev->dev, "no output for the default display\n");
+               return -EINVAL;
        }
 
-       if (i == fbdev->num_managers)
-               return -ENODEV;
+       for (i = 0; i < fbdev->num_displays; ++i) {
+               struct omap_dss_device *dssdev = fbdev->displays[i].dssdev;
+               struct omap_dss_output *out = dssdev->output;
 
-       if (mgr->output)
-               mgr->unset_output(mgr);
+               mgr = omap_dss_get_overlay_manager(dssdev->channel);
 
-       r = mgr->set_output(mgr, dssdev->output);
-       if (r)
-               return r;
+               if (!mgr || !out)
+                       continue;
+
+               if (mgr->output)
+                       mgr->unset_output(mgr);
+
+               mgr->set_output(mgr, out);
+       }
+
+       mgr = def_dssdev->output->manager;
+
+       if (!mgr) {
+               dev_err(fbdev->dev, "no ovl manager for the default display\n");
+               return -EINVAL;
+       }
 
        for (i = 0; i < fbdev->num_overlays; i++) {
                struct omap_overlay *ovl = fbdev->overlays[i];