From: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Fri, 3 Apr 2009 17:09:20 +0000 (+0200)
Subject: DSS2: Disable video planes on sync lost error
X-Git-Tag: Release-2010-05/1~2^2~125
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=bfd201ee7b83942b2429655c884eaf638cf7a96b

DSS2: Disable video planes on sync lost error

When encountering the sync lost error disable the display and all video
planes on the affected manager. Afterwards re-enable the display.

Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
---

diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 1bc23f7daad1..41734f353b11 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -2518,29 +2518,79 @@ static void dispc_error_worker(struct work_struct *work)
 	}
 
 	if (errors & DISPC_IRQ_SYNC_LOST) {
+		struct omap_overlay_manager *manager = NULL;
+		bool enable = false;
+
 		DSSERR("SYNC_LOST, disabling LCD\n");
+
 		for (i = 0; i < omap_dss_get_num_overlay_managers(); ++i) {
 			struct omap_overlay_manager *mgr;
 			mgr = omap_dss_get_overlay_manager(i);
 
 			if (mgr->id == OMAP_DSS_CHANNEL_LCD) {
+				manager = mgr;
+				enable = mgr->display->state ==
+						OMAP_DSS_DISPLAY_ACTIVE;
 				mgr->display->disable(mgr->display);
 				break;
 			}
 		}
+
+		if (manager) {
+			for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
+				struct omap_overlay *ovl;
+				ovl = omap_dss_get_overlay(i);
+
+				if (!(ovl->caps & OMAP_DSS_OVL_CAP_DISPC))
+					continue;
+
+				if (ovl->id != 0 && ovl->manager == manager)
+					dispc_enable_plane(ovl->id, 0);
+			}
+
+			dispc_go(manager->id);
+			mdelay(50);
+			if (enable)
+				manager->display->enable(manager->display);
+		}
 	}
 
 	if (errors & DISPC_IRQ_SYNC_LOST_DIGIT) {
+		struct omap_overlay_manager *manager = NULL;
+		bool enable = false;
+
 		DSSERR("SYNC_LOST_DIGIT, disabling TV\n");
+
 		for (i = 0; i < omap_dss_get_num_overlay_managers(); ++i) {
 			struct omap_overlay_manager *mgr;
 			mgr = omap_dss_get_overlay_manager(i);
 
 			if (mgr->id == OMAP_DSS_CHANNEL_DIGIT) {
+				manager = mgr;
+				enable = mgr->display->state ==
+						OMAP_DSS_DISPLAY_ACTIVE;
 				mgr->display->disable(mgr->display);
 				break;
 			}
 		}
+
+		if (manager) {
+			for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
+				struct omap_overlay *ovl;
+				ovl = omap_dss_get_overlay(i);
+
+				if (!(ovl->caps & OMAP_DSS_OVL_CAP_DISPC))
+					continue;
+
+				if (ovl->id != 0 && ovl->manager == manager)
+					dispc_enable_plane(ovl->id, 0);
+			}
+
+			dispc_go(manager->id);
+			mdelay(50);
+			if (enable)
+				manager->display->enable(manager->display);
+		}
 	}
 
 	if (errors & DISPC_IRQ_OCP_ERR) {