summaryrefslogtreecommitdiff
path: root/recipes/xorg-driver
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-12-30 19:52:54 +0100
committerKoen Kooi <koen@openembedded.org>2010-01-02 16:50:46 +0100
commita3e3a952792fcd0a917dfd2eed08b07bdcd63900 (patch)
tree213a9bdffaf33f5e5a146235f926f06df1f9e1f3 /recipes/xorg-driver
parent6690b8fcee9bc9152948b9a623117dd62bcf45de (diff)
xf86-video-omapfb: refresh patch
Diffstat (limited to 'recipes/xorg-driver')
-rw-r--r--recipes/xorg-driver/xf86-video-omapfb/0001-omapfb-driver-hack-out-dpms-for-xorg-1.7.x.patch70
-rw-r--r--recipes/xorg-driver/xf86-video-omapfb_git.bb2
2 files changed, 49 insertions, 23 deletions
diff --git a/recipes/xorg-driver/xf86-video-omapfb/0001-omapfb-driver-hack-out-dpms-for-xorg-1.7.x.patch b/recipes/xorg-driver/xf86-video-omapfb/0001-omapfb-driver-hack-out-dpms-for-xorg-1.7.x.patch
index 5008bba546..509d34c6e9 100644
--- a/recipes/xorg-driver/xf86-video-omapfb/0001-omapfb-driver-hack-out-dpms-for-xorg-1.7.x.patch
+++ b/recipes/xorg-driver/xf86-video-omapfb/0001-omapfb-driver-hack-out-dpms-for-xorg-1.7.x.patch
@@ -1,14 +1,14 @@
-From 7bfdb731125e2bd18975a3a0f35e424076d55366 Mon Sep 17 00:00:00 2001
+From a0c063716101ec93dcad30028ba41489926050c9 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Tue, 22 Dec 2009 21:35:00 +0100
-Subject: [PATCH] omapfb-driver: hack out dpms for xorg 1.7.x
+Subject: [PATCH 1/2] omapfb-driver: hack out dpms for xorg 1.7.x
---
- src/omapfb-driver.c | 7 +++----
- 1 files changed, 3 insertions(+), 4 deletions(-)
+ src/omapfb-driver.c | 39 ---------------------------------------
+ 1 files changed, 0 insertions(+), 39 deletions(-)
diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c
-index a9d5fbc..ef92ce4 100644
+index a9d5fbc..36a0d53 100644
--- a/src/omapfb-driver.c
+++ b/src/omapfb-driver.c
@@ -41,9 +41,6 @@
@@ -21,37 +21,63 @@ index a9d5fbc..ef92ce4 100644
#include <linux/fb.h>
/* TODO: we'd like this to come from kernel headers, but that's not a good
-@@ -581,7 +578,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+@@ -580,9 +577,6 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ /* NO-OP currently */
pScreen->SaveScreen = OMAPFBSaveScreen;
- /* Setup DPMS support */
+- /* Setup DPMS support */
- xf86DPMSInit(pScreen, OMAPFBDPMSSet, 0);
-+ //xf86DPMSInit(pScreen, fbdevHWDPMSSetWeak(), 0);
-
+-
#ifdef USE_EXA
/* EXA init */
-@@ -723,6 +720,7 @@ static Bool OMAPFBSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+ xf86LoadSubModule(pScrn, "exa");
+@@ -723,38 +717,6 @@ static Bool OMAPFBSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
return TRUE;
}
-+#if 0
- static void
- OMAPFBDPMSSet(ScrnInfoPtr pScrn, int mode, int flags)
- {
-@@ -754,6 +752,7 @@ OMAPFBDPMSSet(ScrnInfoPtr pScrn, int mode, int flags)
- }
-
- }
-+#endif
-
+-static void
+-OMAPFBDPMSSet(ScrnInfoPtr pScrn, int mode, int flags)
+-{
+- OMAPFBPtr ofb = OMAPFB(pScrn);
+-
+- switch (mode) {
+- case DPMSModeOn:
+- if (ioctl(ofb->fd, FBIOBLANK, (void *)VESA_NO_BLANKING)) {
+- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+- "FBIOBLANK: %s\n", strerror(errno));
+- }
+- break;
+- case DPMSModeStandby:
+- case DPMSModeSuspend:
+- /* TODO: Maybe we would want to use the above modes for
+- * dimming the LCD? That'd match the functionality
+- * (save power)
+- */
+- case DPMSModeOff:
+- /* OMAPFB only supports on and off */
+- if (ioctl(ofb->fd, FBIOBLANK, (void *)VESA_POWERDOWN)) {
+- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+- "FBIOBLANK: %s\n", strerror(errno));
+- }
+- break;
+- break;
+- default:
+- return;
+- }
+-
+-}
+-
void
OMAPFBPrintCapabilities(ScrnInfoPtr pScrn,
-@@ -879,7 +878,7 @@ OMAPFBSetup(pointer module, pointer opts, int *errmaj, int *errmin)
+ struct omapfb_caps *caps,
+@@ -879,7 +841,6 @@ OMAPFBSetup(pointer module, pointer opts, int *errmaj, int *errmin)
if (!setupDone) {
setupDone = TRUE;
xf86AddDriver(&OMAPFB, module, HaveDriverFuncs);
- LoaderRefSymLists(fbSymbols, NULL);
-+ //LoaderRefSymLists(fbSymbols, NULL);
return (pointer)1;
} else {
if (errmaj) *errmaj = LDR_ONCEONLY;
+--
+1.6.5
+
diff --git a/recipes/xorg-driver/xf86-video-omapfb_git.bb b/recipes/xorg-driver/xf86-video-omapfb_git.bb
index 567331df42..8eb5c9f65b 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 = "a"
+PR_append = "b"
SRCREV = "5317aae587a2bf48f07a8c06bfaf7bcbfd23bafc"
PV = "0.1.1+${PR}+gitr${SRCREV}"