All of lore.kernel.org
 help / color / mirror / Atom feed
From: ville.syrjala@nokia.com
To: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Cc: linux-fbdev@vger.kernel.org, linux-omap@vger.kernel.org,
	"Ville Syrjälä" <ville.syrjala@nokia.com>
Subject: [PATCH 3/4] DSS2: Make wait_for_go() succeed for disabled displays
Date: Fri, 05 Mar 2010 13:26:21 +0000	[thread overview]
Message-ID: <1267795582-21004-3-git-send-email-ville.syrjala@nokia.com> (raw)
In-Reply-To: <1267795582-21004-1-git-send-email-ville.syrjala@nokia.com>

From: Ville Syrj채l채 <ville.syrjala@nokia.com>

When the display is not active make the wait_for_go() functions return
immediately.

Signed-off-by: Ville Syrj채l채 <ville.syrjala@nokia.com>
---
 drivers/video/omap2/dss/manager.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c
index 913142d..0e7b036 100644
--- a/drivers/video/omap2/dss/manager.c
+++ b/drivers/video/omap2/dss/manager.c
@@ -524,7 +524,7 @@ static int dss_mgr_wait_for_go(struct omap_overlay_manager *mgr)
 	int i;
 	struct omap_dss_device *dssdev = mgr->device;
 
-	if (!dssdev)
+	if (!dssdev || dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
 		return 0;
 
 	if (dssdev->type = OMAP_DISPLAY_TYPE_VENC) {
@@ -595,11 +595,14 @@ int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl)
 	int r;
 	int i;
 
-	if (!ovl->manager || !ovl->manager->device)
+	if (!ovl->manager)
 		return 0;
 
 	dssdev = ovl->manager->device;
 
+	if (!dssdev || dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
+		return 0;
+
 	if (dssdev->type = OMAP_DISPLAY_TYPE_VENC) {
 		irq = DISPC_IRQ_EVSYNC_ODD | DISPC_IRQ_EVSYNC_EVEN;
 		channel = OMAP_DSS_CHANNEL_DIGIT;
-- 
1.6.4.4

--
To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

WARNING: multiple messages have this Message-ID (diff)
From: ville.syrjala@nokia.com
To: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Cc: linux-fbdev@vger.kernel.org, linux-omap@vger.kernel.org,
	"Ville Syrjälä" <ville.syrjala@nokia.com>
Subject: [PATCH 3/4] DSS2: Make wait_for_go() succeed for disabled displays
Date: Fri,  5 Mar 2010 15:26:21 +0200	[thread overview]
Message-ID: <1267795582-21004-3-git-send-email-ville.syrjala@nokia.com> (raw)
In-Reply-To: <1267795582-21004-1-git-send-email-ville.syrjala@nokia.com>

From: Ville Syrjälä <ville.syrjala@nokia.com>

When the display is not active make the wait_for_go() functions return
immediately.

Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
---
 drivers/video/omap2/dss/manager.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c
index 913142d..0e7b036 100644
--- a/drivers/video/omap2/dss/manager.c
+++ b/drivers/video/omap2/dss/manager.c
@@ -524,7 +524,7 @@ static int dss_mgr_wait_for_go(struct omap_overlay_manager *mgr)
 	int i;
 	struct omap_dss_device *dssdev = mgr->device;
 
-	if (!dssdev)
+	if (!dssdev || dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
 		return 0;
 
 	if (dssdev->type == OMAP_DISPLAY_TYPE_VENC) {
@@ -595,11 +595,14 @@ int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl)
 	int r;
 	int i;
 
-	if (!ovl->manager || !ovl->manager->device)
+	if (!ovl->manager)
 		return 0;
 
 	dssdev = ovl->manager->device;
 
+	if (!dssdev || dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
+		return 0;
+
 	if (dssdev->type == OMAP_DISPLAY_TYPE_VENC) {
 		irq = DISPC_IRQ_EVSYNC_ODD | DISPC_IRQ_EVSYNC_EVEN;
 		channel = OMAP_DSS_CHANNEL_DIGIT;
-- 
1.6.4.4

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2010-03-05 13:26 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-05 13:26 [PATCH v3 1/4] DSS2: OMAPFB: Add support for switching memory regions ville.syrjala
2010-03-05 13:26 ` ville.syrjala
2010-03-05 13:26 ` [PATCH 2/4] DSS2: Check if display supports update mode changes ville.syrjala
2010-03-05 13:26   ` ville.syrjala
2010-03-05 13:26 ` ville.syrjala [this message]
2010-03-05 13:26   ` [PATCH 3/4] DSS2: Make wait_for_go() succeed for disabled displays ville.syrjala
2010-03-05 13:26 ` [PATCH 4/4] DSS2: clear spurious SYNC_LOST_DIGIT interrupts ville.syrjala
2010-03-05 13:26   ` ville.syrjala
2010-03-05 15:19   ` Aguirre, Sergio
2010-03-05 15:19     ` Aguirre, Sergio
2010-03-05 15:25     ` Tomi Valkeinen
2010-03-05 15:25       ` Tomi Valkeinen
2010-03-05 15:28       ` Aguirre, Sergio
2010-03-05 15:28         ` Aguirre, Sergio
2010-03-17 13:50 ` [PATCH v3 1/4] DSS2: OMAPFB: Add support for switching memory Tomi Valkeinen
2010-03-17 13:50   ` [PATCH v3 1/4] DSS2: OMAPFB: Add support for switching memory regions Tomi Valkeinen
2010-03-17 15:51   ` [PATCH v3 1/4] DSS2: OMAPFB: Add support for switching memory Ville Syrjälä
2010-03-17 15:51     ` [PATCH v3 1/4] DSS2: OMAPFB: Add support for switching memory regions Ville Syrjälä
2010-03-17 17:34 ` [PATCH v3 1/4] DSS2: OMAPFB: Add support for switching memory Imre Deak
2010-03-17 17:34   ` [PATCH v3 1/4] DSS2: OMAPFB: Add support for switching memory regions Imre Deak
2010-03-17 20:14   ` [PATCH v3 1/4] DSS2: OMAPFB: Add support for switching memory Ville Syrjälä
2010-03-17 20:14     ` [PATCH v3 1/4] DSS2: OMAPFB: Add support for switching memory regions Ville Syrjälä
2010-03-18  8:52     ` [PATCH v3 1/4] DSS2: OMAPFB: Add support for switching memory Imre Deak
2010-03-18  8:52       ` [PATCH v3 1/4] DSS2: OMAPFB: Add support for switching memory regions Imre Deak
2010-03-18 15:26       ` [PATCH v3 1/4] DSS2: OMAPFB: Add support for switching memory Ville Syrjälä
2010-03-18 15:26         ` [PATCH v3 1/4] DSS2: OMAPFB: Add support for switching memory regions Ville Syrjälä
2010-03-19  7:46         ` [PATCH v3 1/4] DSS2: OMAPFB: Add support for switching memory Imre Deak
2010-03-19  7:46           ` [PATCH v3 1/4] DSS2: OMAPFB: Add support for switching memory regions Imre Deak
2010-03-19 12:23           ` [PATCH v3 1/4] DSS2: OMAPFB: Add support for switching memory Ville Syrjälä
2010-03-19 12:23             ` [PATCH v3 1/4] DSS2: OMAPFB: Add support for switching memory regions Ville Syrjälä

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1267795582-21004-3-git-send-email-ville.syrjala@nokia.com \
    --to=ville.syrjala@nokia.com \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=tomi.valkeinen@nokia.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.