summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README35
-rw-r--r--configure.ac2
-rw-r--r--src/geode_ddc.c4
-rw-r--r--src/gx_randr.c8
-rw-r--r--src/z4l.c2
5 files changed, 36 insertions, 15 deletions
diff --git a/README b/README
index 31ab8cb..bd06c2d 100644
--- a/README
+++ b/README
@@ -1,13 +1,36 @@
-AMD Geode GX and LX Xorg graphics Driver
-May 9, 2007
-========================================
+AMD Geode GX and LX graphics driver for X.Org
+=============================================
+Last updated: 2008-08-13
= Introduction =
This is the X graphics driver for the AMD Geode GX and LX processors.
The GX driver features XAA and EXA support for graphics acceleration,
and the LX driver supports EXA (including compositing). Both drivers
-suppport dynamic rotation with XRandR, and Xv overlay support.
+support dynamic rotation with XRandR, and Xv overlay support.
+
+http://wiki.x.org/wiki/AMDGeodeDriver
+
+= Roadmap =
+
+Support for X servers older than 1.4 is expected to be dropped in the
+near future. If your distribution still hasn't upgraded, please urge
+them to get around it soon.
+
+Support for old GX1 Geodes by Cyrix and NSC will be reintroduced soon,
+at which point xf86-video-cyrix and xf86-video-nsc will be retired.
+
+= Dependencies =
+
+As of version 2.9.0, this driver depends on X.Org server 1.3 or newer,
+because it utilizes the new common DDC probing libraries from X.Org.
+
+If necessary, it might be possible to create autoconf macros to make
+this driver compile against older X servers, following this example:
+
+http://lists.freedesktop.org/archives/xorg-commit/2007-February/010341.html
+
+Patches accomplishing the same trick for the Geode driver are welcome.
= Configuration options =
@@ -46,6 +69,4 @@ ExaScratch: Specify the amount of extra EXA scratch buffer (in bytes)
FBSize: Specify the size of the video space (in bytes)
PanelGeometry: Specify the geometry of the attached panel ("<width>x<height>")
-
-
-
+= EOF =
diff --git a/configure.ac b/configure.ac
index 3eef3b3..469c07c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-geode],
- 2.10.0,
+ 2.10.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver%2Fgeode],
xf86-video-geode)
diff --git a/src/geode_ddc.c b/src/geode_ddc.c
index feabcf6..2533488 100644
--- a/src/geode_ddc.c
+++ b/src/geode_ddc.c
@@ -80,9 +80,9 @@ geode_gpio_iobase(void)
Tag = pciFindFirst(CS5536_ISA_DEVICE, 0xFFFFFFFF);
if (Tag == PCI_NOT_FOUND) {
- Tag = pciFindFirst(CS5535_ISA_DEVICE, 0xFFFFFFFF);
+ Tag = pciFindFirst(CS5535_ISA_DEVICE, 0xFFFFFFFF);
- if (Tag == PCI_NOT_FOUND)
+ if (Tag == PCI_NOT_FOUND)
return 0;
}
diff --git a/src/gx_randr.c b/src/gx_randr.c
index 8d53269..6cdd244 100644
--- a/src/gx_randr.c
+++ b/src/gx_randr.c
@@ -248,7 +248,7 @@ GXRandRSetConfig(ScreenPtr pScreen, Rotation rotation,
}
/* FIXME: we don't have a new video ABI yet */
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 3
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
miPointerGetPosition(inputInfo.pointer, &px, &py);
#else
miPointerPosition(&px, &py);
@@ -292,7 +292,7 @@ GXRandRSetConfig(ScreenPtr pScreen, Rotation rotation,
}
/* FIXME: we don't have a new video ABI yet */
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 3
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
if (pScreen == miPointerGetScreen(inputInfo.pointer))
#else
if (pScreen == miPointerCurrentScreen())
@@ -305,8 +305,8 @@ GXRandRSetConfig(ScreenPtr pScreen, Rotation rotation,
/* FIXME: we don't have a new video ABI yet */
(*pScreen->SetCursorPosition) (
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 3
- inputInfo.pointer,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
+ inputInfo.pointer,
#endif
pScreen, px, py, FALSE);
}
diff --git a/src/z4l.c b/src/z4l.c
index e5a819e..4877b89 100644
--- a/src/z4l.c
+++ b/src/z4l.c
@@ -1723,7 +1723,7 @@ static MODULESETUPPROTO(z4lSetup);
static XF86ModuleVersionInfo z4lVersionRec = {
"ztv",
MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2,
- XF86_VERSION_CURRENT, 0, 0, 1,
+ XORG_VERSION_CURRENT, 0, 0, 1,
ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, MOD_CLASS_NONE,
{0, 0, 0, 0}
};