Merge omapdss single-dssdev series

This series contains patches that change how omapdss's panel devices
(omap_dss_device) are initialized and registered. There are two patches that
change behaviour, the rest are just cleanups:

The patch "omap_dss_register_device() doesn't take display index" affects the
number for the "displayX" sysfs files. This hopefully doesn't affect the
userspace, as the number has never been a clear indication of what the
particular display is.

The patch "register only one display device per output" affects how panel
devices are created. Currently we support multiple panels per output, i.e. you
could have DVI and an LCD displays using the same DPI output, as long as the
DVI and LCD are not used at the same time.

This patch changes the omapdss driver to only register one display device per
output. If there are multiple displays for the output, either the first one is
picked or, if def_display has been defined in kernel parameters and the
def_display is one of the displays for this output, the def_display is picked.
See the patch for more information.

  OMAPDSS: alloc dssdevs dynamically
  OMAPDSS: cleanup dss_recheck_connections further
  OMAPDSS: cleanup dss_recheck_connections
  OMAPDSS: handle errors in dss_init_device
  OMAPDSS: explicitely initialize dssdev->channel for new displays
  OMAPDSS: register only one display device per output
  OMAPDSS: Add dss_get_default_display_name()
  OMAPDSS: omap_dss_register_device() doesn't take display index

1 files changed, 78 insertions, 7 deletions

diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c
index 5f09d503d619..db83ae81a713 100644
--- a/drivers/video/omap2/dss/display.c
+++ b/drivers/video/omap2/dss/display.c
@@ -320,26 +320,98 @@ void omapdss_default_get_timings(struct omap_dss_device *dssdev,
 }
 EXPORT_SYMBOL(omapdss_default_get_timings);
 
-void dss_init_device(struct platform_device *pdev,
+/*
+ * Connect dssdev to a manager if the manager is free or if force is specified.
+ * Connect all overlays to that manager if they are free or if force is
+ * specified.
+ */
+static int dss_init_connections(struct omap_dss_device *dssdev, bool force)
+{
+        struct omap_overlay_manager *mgr;
+        int i, r;
+
+        WARN_ON(dssdev->manager);
+
+        mgr = omap_dss_get_overlay_manager(dssdev->channel);
+
+        if (mgr->device && !force)
+                return 0;
+
+        if (mgr->device)
+                mgr->unset_device(mgr);
+
+        r = mgr->set_device(mgr, dssdev);
+        if (r) {
+                DSSERR("failed to set initial manager\n");
+                return r;
+        }
+
+        for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
+                struct omap_overlay *ovl = omap_dss_get_overlay(i);
+
+                if (!ovl->manager || force) {
+                        if (ovl->manager)
+                                ovl->unset_manager(ovl);
+
+                        r = ovl->set_manager(ovl, mgr);
+                        if (r) {
+                                DSSERR("failed to set initial overlay\n");
+                                return r;
+                        }
+                }
+        }
+
+        return 0;
+}
+
+static void dss_uninit_connections(struct omap_dss_device *dssdev)
+{
+        if (dssdev->manager)
+                dssdev->manager->unset_device(dssdev->manager);
+}
+
+int dss_init_device(struct platform_device *pdev,
                 struct omap_dss_device *dssdev)
 {
         struct device_attribute *attr;
-        int i;
-        int r;
+        int i, r;
+        const char *def_disp_name = dss_get_default_display_name();
+        bool force;
+
+        force = def_disp_name && strcmp(def_disp_name, dssdev->name) == 0;
+        dss_init_connections(dssdev, force);
 
         /* create device sysfs files */
         i = 0;
         while ((attr = display_sysfs_attrs[i++]) != NULL) {
                 r = device_create_file(&dssdev->dev, attr);
-                if (r)
+                if (r) {
+                        for (i = i - 2; i >= 0; i--) {
+                                attr = display_sysfs_attrs[i];
+                                device_remove_file(&dssdev->dev, attr);
+                        }
+
+                        dss_uninit_connections(dssdev);
+
                         DSSERR("failed to create sysfs file\n");
+                        return r;
+                }
         }
 
         /* create display? sysfs links */
         r = sysfs_create_link(&pdev->dev.kobj, &dssdev->dev.kobj,
                         dev_name(&dssdev->dev));
-        if (r)
+        if (r) {
+                while ((attr = display_sysfs_attrs[i++]) != NULL)
+                        device_remove_file(&dssdev->dev, attr);
+
+                dss_uninit_connections(dssdev);
+
                 DSSERR("failed to create sysfs display link\n");
+                return r;
+        }
+
+        return 0;
 }
 
 void dss_uninit_device(struct platform_device *pdev,
@@ -353,8 +425,7 @@ void dss_uninit_device(struct platform_device *pdev,
         while ((attr = display_sysfs_attrs[i++]) != NULL)
                 device_remove_file(&dssdev->dev, attr);
 
-        if (dssdev->manager)
-                dssdev->manager->unset_device(dssdev->manager);
+        dss_uninit_connections(dssdev);
 }
 
 static int dss_suspend_device(struct device *dev, void *data)