From: Dandawate Saket <dsaket@ti.com>
Date: Fri, 6 Jul 2012 22:16:29 +0000 (-0700)
Subject: OMAPDSS: OMAPFB : Dont error if default display is ON
X-Git-Tag: android-3.8-6AJ.1.1~2^2~76
X-Git-Url: https://git.ti.com/gitweb?p=android-sdk%2Fkernel-video.git;a=commitdiff_plain;h=b01c08d14f30cace79650e02cbb3319b6ed29158

OMAPDSS: OMAPFB : Dont error if default display is ON

Dont error if default display state is already ON.

Change-Id: I25120083613f5e0ef0e2fea7a5fd26182e1e4b7e
Signed-off-by: Muralidhar Dixit <murali.dixit@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
---

diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index d0b1ff18351..32eb09212df 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -2479,11 +2479,14 @@ static int omapfb_init_display(struct omapfb2_device *fbdev,
 	struct omapfb_display_data *d;
 	int r;
 
-	r = dssdrv->enable(dssdev);
-	if (r) {
-		dev_warn(fbdev->dev, "Failed to enable display '%s'\n",
-				dssdev->name);
-		return r;
+	if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE) {
+
+		r = dssdrv->enable(dssdev);
+		if (r) {
+			dev_warn(fbdev->dev, "Failed to enable display '%s'\n",
+					dssdev->name);
+			return r;
+		}
 	}
 
 	d = get_display_data(fbdev, dssdev);