From 16f3fff44323bd6b4349d909667b51a2fef3f278 Mon Sep 17 00:00:00 2001
From: Grazvydas Ignotas <notasas@gmail.com>
Date: Sat, 28 Aug 2010 01:12:01 +0300
Subject: [PATCH] xf86-video-omapfb: pandora: handle cycle/forcer events better

---
 .../pandora_backlight_dim.patch               | 29 ++++++++++++++++---
 recipes/xorg-driver/xf86-video-omapfb_git.bb  |  2 +-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/recipes/xorg-driver/xf86-video-omapfb/pandora_backlight_dim.patch b/recipes/xorg-driver/xf86-video-omapfb/pandora_backlight_dim.patch
index f722682fe9..4a0b8432d0 100644
--- a/recipes/xorg-driver/xf86-video-omapfb/pandora_backlight_dim.patch
+++ b/recipes/xorg-driver/xf86-video-omapfb/pandora_backlight_dim.patch
@@ -1,18 +1,39 @@
 diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c
-index 7a57221..fa97724 100644
+index 7a57221..62f5ccb 100644
 --- a/src/omapfb-driver.c
 +++ b/src/omapfb-driver.c
-@@ -788,7 +788,13 @@ OMAPFBLeaveVT(int scrnIndex, int flags)
+@@ -788,7 +788,34 @@ OMAPFBLeaveVT(int scrnIndex, int flags)
  static Bool
  OMAPFBSaveScreen(ScreenPtr pScreen, int mode)
  {
 -	xf86Msg(X_NOT_IMPLEMENTED, "%s: Dim backlight?\n", __FUNCTION__);
 +	/* call Pandora specific script */
++	static int blanking;
 +	char cmd[256];
++	int arg;
 +
-+	snprintf(cmd, sizeof(cmd), "/usr/pandora/scripts/op_lid.sh %d",
-+		 (mode == SCREEN_SAVER_ON || mode == SCREEN_SAVER_CYCLE) ? 1 : 0);
++	switch (mode) {
++		case SCREEN_SAVER_CYCLE:
++			if (blanking)
++				return TRUE;
++			/* fallthrough */
++		case SCREEN_SAVER_ON:
++			arg = 1;
++			break;
++
++		default:
++		case SCREEN_SAVER_FORCER:
++			if (!blanking)
++				return TRUE;
++			/* fallthrough */
++		case SCREEN_SAVER_OFF:
++			arg = 0;
++			break;
++	}
++
++	snprintf(cmd, sizeof(cmd), "/usr/pandora/scripts/op_lid.sh %d", arg);
 +	system(cmd);
++	blanking = arg;
 +
  	return TRUE;
  }
diff --git a/recipes/xorg-driver/xf86-video-omapfb_git.bb b/recipes/xorg-driver/xf86-video-omapfb_git.bb
index cab29220ba..0030602093 100644
--- a/recipes/xorg-driver/xf86-video-omapfb_git.bb
+++ b/recipes/xorg-driver/xf86-video-omapfb_git.bb
@@ -2,7 +2,7 @@ require xorg-driver-video.inc
 
 DESCRIPTION = "X.Org X server -- OMAP display driver"
 
-PR_append = "f"
+PR_append = "g"
 
 SRCREV = "db636c8436265c3d86c5b8e00785e45d55825c80"
 PV = "0.1.1+${PR}+gitr${SRCREV}"
-- 
2.39.5