rpms/xorg-x11-drv-geode/devel abi.patch, NONE, 1.1 geode-inputstr.patch, NONE, 1.1 sources, 1.7, 1.8 xorg-x11-drv-geode.spec, 1.9, 1.10

Tue Jun 23 00:17:54 UTC 2009

Author: airlied

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

Modified Files:
	sources xorg-x11-drv-geode.spec 
Added Files:
	abi.patch geode-inputstr.patch 
Log Message:
* Tue Jun 23 2009 Dave Airlie <airlied at redhat.com> 2.11.2-2
- update for new server ABI


abi.patch:

--- NEW FILE abi.patch ---
diff -up xf86-video-geode-2.11.2/src/geode_driver.c.abi xf86-video-geode-2.11.2/src/geode_driver.c
--- xf86-video-geode-2.11.2/src/geode_driver.c.abi	2009-06-23 10:13:36.000000000 +1000
+++ xf86-video-geode-2.11.2/src/geode_driver.c	2009-06-23 10:15:04.000000000 +1000
@@ -229,69 +229,6 @@ OptionInfoRec no_GeodeOptions[] = {
     {-1, NULL, OPTV_NONE, {0}, FALSE}
 };
 
-/* List of symbols from other modules that this module references.The purpose
-* is that to avoid unresolved symbol warnings
-*/
-const char *amdVgahwSymbols[] = {
-    "vgaHWGetHWRec",
-    "vgaHWUnlock",
-    "vgaHWInit",
-    "vgaHWSave",
-    "vgaHWRestore",
-    "vgaHWProtect",
-    "vgaHWGetIOBase",
-    "vgaHWMapMem",
-    "vgaHWLock",
-    "vgaHWFreeHWRec",
-    "vgaHWSaveScreen",
-    NULL
-};
-
-const char *amdVbeSymbols[] = {
-    "VBEInit",
-    "vbeDoEDID",
-    "vbeFree",
-    NULL
-};
-
-const char *amdInt10Symbols[] = {
-    "xf86ExecX86int10",
-    "xf86InitInt10",
-    "xf86Int10AllocPages",
-    "xf86Int10Addr",
-    NULL
-};
-
-const char *amdFbSymbols[] = {
-    "fbScreenInit",
-    "fbPictureInit",
-    NULL
-};
-
-const char *amdXaaSymbols[] = {
-    "XAADestroyInfoRec",
-    "XAACreateInfoRec",
-    "XAAInit",
-    "XAAScreenIndex",
-    NULL
-};
-
-const char *amdExaSymbols[] = {
-    "exaGetVersion",
-    "exaDriverInit",
-    "exaDriverFini",
-    "exaOffscreenAlloc",
-    "exaOffscreenFree",
-    NULL
-};
-
-const char *amdRamdacSymbols[] = {
-    "xf86InitCursor",
-    "xf86CreateCursorInfoRec",
-    "xf86DestroyCursorInfoRec",
-    NULL
-};
-
 #ifdef XFree86LOADER
 
 /* Module loader interface */
@@ -341,9 +278,6 @@ GeodeSetup(pointer Module, pointer Optio
     init = TRUE;
     xf86AddDriver(&GEODE, Module, flag);
 
-    LoaderRefSymLists(amdVgahwSymbols, amdVbeSymbols,
-	amdFbSymbols, amdXaaSymbols, amdInt10Symbols, amdRamdacSymbols, NULL);
-
     return (pointer) TRUE;
 }
 
@@ -361,13 +295,6 @@ AmdSetup(pointer Module, pointer Options
 	    0
 #endif
 	    );
-
-	/* Tell the loader about symbols from other modules that this
-	 * module might refer to.
-	 */
-	LoaderRefSymLists(amdVgahwSymbols, amdVbeSymbols,
-	    amdFbSymbols, amdXaaSymbols,
-	    amdInt10Symbols, amdRamdacSymbols, NULL);
 	return (pointer) TRUE;
     }
 
diff -up xf86-video-geode-2.11.2/src/gx_driver.c.abi xf86-video-geode-2.11.2/src/gx_driver.c
--- xf86-video-geode-2.11.2/src/gx_driver.c.abi	2009-06-23 10:13:29.000000000 +1000
+++ xf86-video-geode-2.11.2/src/gx_driver.c	2009-06-23 10:14:40.000000000 +1000
@@ -73,14 +73,6 @@
 
 extern OptionInfoRec GX_GeodeOptions[];
 
-extern const char *amdVgahwSymbols[];
-extern const char *amdVbeSymbols[];
-extern const char *amdInt10Symbols[];
-extern const char *amdFbSymbols[];
-extern const char *amdXaaSymbols[];
-extern const char *amdExaSymbols[];
-extern const char *amdRamdacSymbols[];
-
 unsigned char *XpressROMPtr;
 
 static inline void
@@ -622,7 +614,6 @@ GXPreInit(ScrnInfoPtr pScrni, int flags)
 
 	if (!xf86LoadSubModule(pScrni, "int10"))
 	    return FALSE;
-	xf86LoaderReqSymLists(amdInt10Symbols, NULL);
 
 	pVesa = pGeode->vesa;
 
@@ -694,31 +685,21 @@ GXPreInit(ScrnInfoPtr pScrni, int flags)
     xf86SetDpi(pScrni, 0, 0);
 
     /* Load the modules we'll need */
-
     if (xf86LoadSubModule(pScrni, "fb") == NULL) {
 	return FALSE;
     }
 
-    xf86LoaderReqSymLists(amdFbSymbols, NULL);
-
     if (pGeode->NoAccel == FALSE) {
 	const char *module = (pGeode->useEXA) ? "exa" : "xaa";
-	const char **symbols = (pGeode->useEXA) ?
-	    &amdExaSymbols[0] : &amdXaaSymbols[0];
-
 	if (!xf86LoadSubModule(pScrni, module)) {
 	    return FALSE;
 	}
-
-	xf86LoaderReqSymLists(symbols, NULL);
     }
 
     if (pGeode->tryHWCursor == TRUE) {
 	if (!xf86LoadSubModule(pScrni, "ramdac")) {
 	    return FALSE;
 	}
-
-	xf86LoaderReqSymLists(amdRamdacSymbols, NULL);
     }
 
     if (xf86RegisterResources(pGeode->pEnt->index, NULL, ResExclusive)) {
diff -up xf86-video-geode-2.11.2/src/lx_driver.c.abi xf86-video-geode-2.11.2/src/lx_driver.c
--- xf86-video-geode-2.11.2/src/lx_driver.c.abi	2009-06-23 10:13:25.000000000 +1000
+++ xf86-video-geode-2.11.2/src/lx_driver.c	2009-06-23 10:13:53.000000000 +1000
@@ -69,11 +69,6 @@
 
 extern OptionInfoRec LX_GeodeOptions[];
 
-extern const char *amdVgahwSymbols[];
-extern const char *amdInt10Symbols[];
-extern const char *amdFbSymbols[];
-extern const char *amdExaSymbols[];
-
 unsigned char *XpressROMPtr;
 
 static Bool
@@ -482,15 +477,11 @@ LXPreInit(ScrnInfoPtr pScrni, int flags)
     /* Set up VGA */
 
     if (pGeode->useVGA) {
-	xf86LoaderReqSymLists(amdVgahwSymbols, NULL);
-
 	VESARec *pVesa;
 
 	if (!xf86LoadSubModule(pScrni, "int10"))
 	    return FALSE;
 
-	xf86LoaderReqSymLists(amdInt10Symbols, NULL);
-
 	pVesa = pGeode->vesa;
 
 	if ((pVesa->pInt = xf86InitInt10(pGeode->pEnt->index)) == NULL) {
@@ -575,13 +566,9 @@ LXPreInit(ScrnInfoPtr pScrni, int flags)
 	return FALSE;
     }
 
-    xf86LoaderReqSymLists(amdFbSymbols, NULL);
-
     if (!pGeode->NoAccel) {
 	if (!xf86LoadSubModule(pScrni, "exa"))
 	    return FALSE;
-
-	xf86LoaderReqSymLists(&amdExaSymbols[0], NULL);
     }
 
     if (xf86RegisterResources(pGeode->pEnt->index, NULL, ResExclusive)) {

geode-inputstr.patch:

--- NEW FILE geode-inputstr.patch ---
diff -up xf86-video-geode-2.11.2/src/gx_randr.c.input xf86-video-geode-2.11.2/src/gx_randr.c
--- xf86-video-geode-2.11.2/src/gx_randr.c.input	2009-06-23 10:11:06.000000000 +1000
+++ xf86-video-geode-2.11.2/src/gx_randr.c	2009-06-23 10:11:15.000000000 +1000
@@ -36,6 +36,7 @@
 #include "xf86Module.h"
 #include "mipointer.h"
 #include "windowstr.h"
+#include "inputstr.h"
 #include <X11/extensions/randr.h>
 #include <randrstr.h>
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-geode/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	16 Feb 2009 21:23:50 -0000	1.7
+++ sources	23 Jun 2009 00:17:24 -0000	1.8
@@ -1 +1 @@
-6e00dd248ac5de89ab4764954ea74a96  xf86-video-geode-2.11.1.tar.bz2
+4c652ecba772f705296b8e52d746857c  xf86-video-geode-2.11.2.tar.bz2


Index: xorg-x11-drv-geode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-geode/devel/xorg-x11-drv-geode.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- xorg-x11-drv-geode.spec	26 Feb 2009 10:48:34 -0000	1.9
+++ xorg-x11-drv-geode.spec	23 Jun 2009 00:17:24 -0000	1.10
@@ -4,7 +4,7 @@
 
 Summary:   Xorg X11 AMD Geode video driver
 Name:      xorg-x11-drv-geode
-Version:   2.11.1
+Version:   2.11.2
 Release:   2%{?dist}
 URL:       http://www.x.org/wiki/AMDGeodeDriver
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-%{version}.tar.bz2
@@ -14,6 +14,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Provides:  xorg-x11-drv-amd = %{version}-%{release}
 Obsoletes: xorg-x11-drv-amd <= 2.7.7.7
 
+Patch0: geode-inputstr.patch
+Patch1: abi.patch
+
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig
@@ -32,6 +35,8 @@ X.Org X11 AMD Geode video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .inputstr
+%patch1 -p1 -b .abi
 
 %build
 %configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} \
@@ -60,6 +65,12 @@ rm -rf $RPM_BUILD_ROOT
 %{driverdir}/ztv_drv.so
 
 %changelog
+* Tue Jun 23 2009 Dave Airlie <airlied at redhat.com> 2.11.2-2
+- update for new server ABI
+
+* Tue May 12 2009 Chris Ball <cjb at laptop.org> 2.11.2-1
+- fix crasher bug due to EXA ABI change: RHBZ #500086
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.11.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


