Module Name: xsrc
Committed By: macallan
Date: Tue Feb 1 03:12:06 UTC 2011
Modified Files:
xsrc/external/mit/xf86-video-sunffb/dist/src: ffb_driver.c
Log Message:
add FFBDriverFunc() so we can tell the Xserver that we do not need PIO access
enabled, now this works again. We'll probably need this on all non-PCI drivers.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c
diff -u xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c:1.5 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c:1.6
--- xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c:1.5 Mon Nov 9 05:33:24 2009
+++ xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c Tue Feb 1 03:12:06 2011
@@ -65,6 +65,9 @@
void FFBSync(ScrnInfoPtr pScrn);
+static Bool FFBDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op,
+ pointer ptr);
+
#define FFB_VERSION 4000
#define FFB_NAME "SUNFFB"
#define FFB_DRIVER_NAME "sunffb"
@@ -87,7 +90,8 @@
FFBProbe,
FFBAvailableOptions,
NULL,
- 0
+ 0,
+ FFBDriverFunc
};
typedef enum {
@@ -130,7 +134,7 @@
if (!setupDone) {
setupDone = TRUE;
- xf86AddDriver(&SUNFFB, module, 0);
+ xf86AddDriver(&SUNFFB, module, HaveDriverFuncs);
/*
* Modules that this driver always requires can be loaded here
@@ -990,3 +994,20 @@
{
FFBDacDPMSMode(GET_FFB_FROM_SCRN(pScrn), DPMSMode, flags);
}
+
+static Bool
+FFBDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op,
+ pointer ptr)
+{
+ xorgHWFlags *flag;
+
+ switch (op) {
+ case GET_REQUIRED_HW_INTERFACES:
+ flag = (CARD32*)ptr;
+ (*flag) = HW_MMIO;
+ return TRUE;
+ default:
+ return FALSE;
+ }
+}
+
