1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
|
From 8dba6751950f65292c5f8a562e282045e9fe0803 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 1/2] omapfb-driver: hack out dpms for xorg 1.7.x
---
src/omapfb-driver.c | 41 -----------------------------------------
1 files changed, 0 insertions(+), 41 deletions(-)
diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c
index a9d5fbc..ffa0df4 100644
--- a/src/omapfb-driver.c
+++ b/src/omapfb-driver.c
@@ -41,9 +41,6 @@
#include "exa.h"
-#define DPMS_SERVER
-#include <X11/extensions/dpms.h>
-
#include <linux/fb.h>
/* TODO: we'd like this to come from kernel headers, but that's not a good
@@ -502,7 +499,6 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
/* Load the fallback module */
xf86LoadSubModule(pScrn, "fb");
- xf86LoaderReqSymLists(fbSymbols, NULL);
/* Initialize fallbacks for the screen */
if (!fbScreenInit(pScreen, ofb->fb, pScrn->virtualX,
@@ -580,13 +576,9 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
/* NO-OP currently */
pScreen->SaveScreen = OMAPFBSaveScreen;
- /* Setup DPMS support */
- xf86DPMSInit(pScreen, OMAPFBDPMSSet, 0);
-
#ifdef USE_EXA
/* EXA init */
xf86LoadSubModule(pScrn, "exa");
- xf86LoaderReqSymLists(exaSymbols, NULL);
/* TODO: This should depend on the AccelMethod option */
ofb->exa = exaDriverAlloc();
@@ -723,38 +715,6 @@ static Bool OMAPFBSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
return TRUE;
}
-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,
struct omapfb_caps *caps,
@@ -879,7 +839,6 @@ OMAPFBSetup(pointer module, pointer opts, int *errmaj, int *errmin)
if (!setupDone) {
setupDone = TRUE;
xf86AddDriver(&OMAPFB, module, HaveDriverFuncs);
- LoaderRefSymLists(fbSymbols, NULL);
return (pointer)1;
} else {
if (errmaj) *errmaj = LDR_ONCEONLY;
--
1.6.5
|
