OMAPDSS: Implement display (dis)connect support

We currently have two steps in panel initialization and startup: probing
and enabling. After the panel has been probed, it's ready and can be
configured and later enabled.

This model is not enough with more complex display pipelines, where we
may have, for example, two panels, of which only one can be used at a
time, connected to the same video output.

To support that kind of scenarios, we need to add new step to the
initialization: connect.

This patch adds support for connecting and disconnecting panels. After
probe, but before connect, no panel ops should be called. When the
connect is called, a proper video pipeline is established, and the panel
is ready for use. If some part in the video pipeline is already
connected (by some other panel), the connect call fails.

One key difference with the old style setup is that connect() handles
also connecting to the overlay manager. This means that the omapfb (or
omapdrm) no longer needs to figure out which overlay manager to use, but
it can just call connect() on the panel, and the proper overlay manager
is connected by omapdss.

This also allows us to add back the support for dynamic switching
between two exclusive panels. However, the current panel device model is
not changed to support this, as the new device model is implemented in
the following patches and the old model will be removed. The new device
model supports dynamic switching.

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

1 files changed, 11 insertions, 1 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index ff9b49276b81..c65dd0d6b01d 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -97,6 +97,7 @@ static int omap_modeset_init(struct drm_device *dev)
         int num_mgrs = dss_feat_get_num_mgrs();
         int num_crtcs;
         int i, id = 0;
+        int r;
 
         omap_crtc_pre_init();
 
@@ -118,6 +119,7 @@ static int omap_modeset_init(struct drm_device *dev)
                 struct drm_connector *connector;
                 struct drm_encoder *encoder;
                 enum omap_channel channel;
+                struct omap_overlay_manager *mgr;
 
                 if (!dssdev->driver) {
                         dev_warn(dev->dev, "%s has no driver.. skipping it\n",
@@ -133,6 +135,13 @@ static int omap_modeset_init(struct drm_device *dev)
                         continue;
                 }
 
+                r = dssdev->driver->connect(dssdev);
+                if (r) {
+                        dev_err(dev->dev, "could not connect display: %s\n",
+                                        dssdev->name);
+                        continue;
+                }
+
                 encoder = omap_encoder_init(dev, dssdev);
 
                 if (!encoder) {
@@ -174,8 +183,9 @@ static int omap_modeset_init(struct drm_device *dev)
                  * other possible channels to which the encoder can connect are
                  * not considered.
                  */
-                channel = dssdev->output->dispc_channel;
 
+                mgr = omapdss_find_mgr_from_display(dssdev);
+                channel = mgr->id;
                 /*
                  * if this channel hasn't already been taken by a previously
                  * allocated crtc, we create a new crtc for it