1 files changed, 12 insertions, 2 deletions

diff --git a/drivers/video/omap2/dss/overlay.c b/drivers/video/omap2/dss/overlay.c
index 41a29024a8d..456efef03c2 100644
--- a/drivers/video/omap2/dss/overlay.c
+++ b/drivers/video/omap2/dss/overlay.c
@@ -664,12 +664,22 @@ void dss_recheck_connections(struct omap_dss_device *dssdev, bool force)
         int i;
         struct omap_overlay_manager *lcd_mgr;
         struct omap_overlay_manager *tv_mgr;
+        struct omap_overlay_manager *lcd2_mgr = NULL;
         struct omap_overlay_manager *mgr = NULL;
 
         lcd_mgr = omap_dss_get_overlay_manager(OMAP_DSS_OVL_MGR_LCD);
         tv_mgr = omap_dss_get_overlay_manager(OMAP_DSS_OVL_MGR_TV);
-
-        if (dssdev->type != OMAP_DISPLAY_TYPE_VENC) {
+        if (dss_has_feature(FEAT_MGR_LCD2))
+                lcd2_mgr = omap_dss_get_overlay_manager(OMAP_DSS_OVL_MGR_LCD2);
+
+        if (dssdev->channel == OMAP_DSS_CHANNEL_LCD2) {
+                if (!lcd2_mgr->device || force) {
+                        if (lcd2_mgr->device)
+                                lcd2_mgr->unset_device(lcd2_mgr);
+                        lcd2_mgr->set_device(lcd2_mgr, dssdev);
+                        mgr = lcd2_mgr;
+                }
+        } else if (dssdev->type != OMAP_DISPLAY_TYPE_VENC) {
                 if (!lcd_mgr->device || force) {
                         if (lcd_mgr->device)
                                 lcd_mgr->unset_device(lcd_mgr);