rpms/xorg-x11-drv-geode/devel geode-dpms-rac-api.patch,NONE,1.1

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-geode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27562

Added Files:
	geode-dpms-rac-api.patch 
Log Message:
* Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 2.11.3-1
- geode 2.11.3 
- add abi/api patches + autoreconf


geode-dpms-rac-api.patch:
 Makefile.am        |    2 +-
 configure.ac       |    9 +++++++++
 src/geode_dcon.c   |    1 -
 src/geode_driver.c |   15 +++++++++++----
 src/gx_driver.c    |    7 ++++++-
 src/gx_video.c     |    1 -
 src/lx_driver.c    |   10 ++++++----
 src/lx_video.c     |    1 -
 src/z4l.c          |    1 -
 9 files changed, 33 insertions(+), 14 deletions(-)

--- NEW FILE geode-dpms-rac-api.patch ---
diff --git a/Makefile.am b/Makefile.am
index adb32f8..0642345 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,6 +28,6 @@ MAINTAINERCLEANFILES = ChangeLog
 .PHONY: ChangeLog
 
 ChangeLog:
-	(GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 057df0f..4f70f7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,10 @@ AC_CONFIG_SRCDIR([Makefile.am])
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_AUX_DIR(.)
 
+# Require xorg-macros: XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
+
 AM_INIT_AUTOMAKE([dist-bzip2])
 
 AM_MAINTAINER_MODE
@@ -83,6 +87,10 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+                  HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
+                  HAVE_XEXTPROTO_71="no")
+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
@@ -125,6 +133,7 @@ AC_SUBST([DRIVER_NAME])
 
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([
 	Makefile
diff --git a/src/geode_dcon.c b/src/geode_dcon.c
index 11df94b..9982671 100644
--- a/src/geode_dcon.c
+++ b/src/geode_dcon.c
@@ -30,7 +30,6 @@
 /* Includes that are used by all drivers */
 #include <xf86.h>
 #include <xf86_OSproc.h>
-#include <xf86Resources.h>
 #include <compiler.h>
 
 #include "geode.h"
diff --git a/src/geode_driver.c b/src/geode_driver.c
index e56e7c4..13635da 100644
--- a/src/geode_driver.c
+++ b/src/geode_driver.c
@@ -42,7 +42,9 @@
 /* Includes that are used by all drivers */
 #include "xf86.h"
 #include "xf86_OSproc.h"
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86Resources.h"
+#endif
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
@@ -72,8 +74,13 @@
 #ifdef DPMSExtension
 #include "globals.h"
 #include "opaque.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
+#endif
+
 #endif /* DPMSExtension */
 
 /* A few things all drivers should have */
@@ -471,11 +478,12 @@ AmdProbe(DriverPtr drv, int flags)
 		/* so take the first one */
 		for (i = 0; i < numUsed; i++) {
 		    /* Allocate a ScrnInfoRec  */
-		    ScrnInfoPtr pScrni = xf86AllocateScreen(drv, 0);
-
+		    ScrnInfoPtr pScrni = NULL;
 		    EntityInfoPtr pEnt = xf86GetEntityInfo(usedChips[i]);
 		    PciChipsets *p_id;
 
+		    pScrni = xf86ConfigPciEntity(pScrni, 0, usedChips[i],
+						 GeodePCIchipsets, NULL, NULL, NULL, NULL, NULL);
 		    for (p_id = GeodePCIchipsets; p_id->numChipset != -1;
 			p_id++) {
 			if (pEnt->chipset == p_id->numChipset) {
@@ -512,8 +520,7 @@ AmdProbe(DriverPtr drv, int flags)
 		    drvr_setup(pScrni);
 
 		    foundScreen = TRUE;
-		    xf86ConfigActivePciEntity(pScrni, usedChips[i],
-			GeodePCIchipsets, NULL, NULL, NULL, NULL, NULL);
+
 		}
 	    }
 	}
diff --git a/src/gx_driver.c b/src/gx_driver.c
index b713897..f526326 100644
--- a/src/gx_driver.c
+++ b/src/gx_driver.c
@@ -35,7 +35,9 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86Resources.h"
+#endif
 #include "xf86cmap.h"
 #include "compiler.h"
 #include "mipointer.h"
@@ -419,8 +421,10 @@ GXPreInit(ScrnInfoPtr pScrni, int flags)
 	return FALSE;
 
     pEnt = xf86GetEntityInfo(pScrni->entityList[0]);
+#ifndef XSERVER_LIBPCIACCESS
     if (pEnt->resources)
 	return FALSE;
+#endif
 
     pGeode = pScrni->driverPrivate = xnfcalloc(sizeof(GeodeRec), 1);
 
@@ -704,12 +708,13 @@ GXPreInit(ScrnInfoPtr pScrni, int flags)
 	}
     }
 
+#ifndef XSERVER_LIBPCIACCESS
     if (xf86RegisterResources(pGeode->pEnt->index, NULL, ResExclusive)) {
 	xf86DrvMsg(pScrni->scrnIndex, X_ERROR,
 	    "Couldn't register the resources.\n");
 	return FALSE;
     }
-
+#endif
     return TRUE;
 }
 
diff --git a/src/gx_video.c b/src/gx_video.c
index 354e179..9041f5f 100644
--- a/src/gx_video.c
+++ b/src/gx_video.c
@@ -45,7 +45,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/lx_driver.c b/src/lx_driver.c
index 107b354..08d1fdd 100644
--- a/src/lx_driver.c
+++ b/src/lx_driver.c
@@ -36,7 +36,9 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86Resources.h"
+#endif
 #include "xf86i2c.h"
 #include "xf86Crtc.h"
 #include "xf86cmap.h"
@@ -289,10 +291,10 @@ LXPreInit(ScrnInfoPtr pScrni, int flags)
 	return FALSE;
 
     pEnt = xf86GetEntityInfo(pScrni->entityList[0]);
-
+#ifndef XSERVER_LIBPCIACCESS
     if (pEnt->resources)
 	return FALSE;
-
+#endif
     if (flags & PROBE_DETECT) {
 	GeodeProbeDDC(pScrni, pEnt->index);
 	return TRUE;
@@ -570,13 +572,13 @@ LXPreInit(ScrnInfoPtr pScrni, int flags)
 	if (!xf86LoadSubModule(pScrni, "exa"))
 	    return FALSE;
     }
-
+#ifndef XSERVER_LIBPCIACCESS
     if (xf86RegisterResources(pGeode->pEnt->index, NULL, ResExclusive)) {
 	xf86DrvMsg(pScrni->scrnIndex, X_ERROR,
 	    "Couldn't register the resources.\n");
 	return FALSE;
     }
-
+#endif
     return TRUE;
 }
 
diff --git a/src/lx_video.c b/src/lx_video.c
index 01ccba7..702139e 100644
--- a/src/lx_video.c
+++ b/src/lx_video.c
@@ -38,7 +38,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/z4l.c b/src/z4l.c
index 4877b89..3935962 100644
--- a/src/z4l.c
+++ b/src/z4l.c
@@ -43,7 +43,6 @@
 #include "xf86.h"
 #include <X11/extensions/Xv.h>
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "xf86xv.h"
 #include "fourcc.h"