rpms/xorg-x11-drv-nv/devel abi.patch, NONE, 1.1 xorg-x11-drv-nv.spec, 1.85, 1.86
Dave Airlie
airlied at fedoraproject.org
Tue Jun 23 00:34:03 UTC 2009
- Previous message (by thread): rpms/xorg-x11-drv-mga/devel abi.patch, NONE, 1.1 sources, 1.12, 1.13 xorg-x11-drv-mga.spec, 1.30, 1.31 mga-1.4.7-alloca.patch, 1.1, NONE mga-1.4.7-death-to-cfb.patch, 1.1, NONE
- Next message (by thread): rpms/gettext/F-11 gettext.spec,1.93,1.94
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: airlied
Update of /cvs/pkgs/rpms/xorg-x11-drv-nv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17171
Modified Files:
xorg-x11-drv-nv.spec
Added Files:
abi.patch
Log Message:
* Tue Jun 23 2009 Dave Airlie <airlied at redhat.com> 2.1.13-2
- patch for new server ABI
abi.patch:
--- NEW FILE abi.patch ---
diff -up xf86-video-nv-2.1.13/src/g80_driver.c.abi xf86-video-nv-2.1.13/src/g80_driver.c
--- xf86-video-nv-2.1.13/src/g80_driver.c.abi 2009-06-23 10:29:56.000000000 +1000
+++ xf86-video-nv-2.1.13/src/g80_driver.c 2009-06-23 10:30:18.000000000 +1000
@@ -55,56 +55,6 @@
#define G80_REG_SIZE (1024 * 1024 * 16)
#define G80_RESERVED_VIDMEM 0xd000
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAACopyROP",
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAFallbackOps",
- "XAAInit",
- "XAAPatternROP",
- NULL
-};
-
-static const char *exaSymbols[] = {
- "exaDriverAlloc",
- "exaDriverInit",
- "exaDriverFini",
- NULL
-};
-
-static const char *i2cSymbols[] = {
- "xf86CreateI2CBusRec",
- "xf86I2CBusInit",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-static const char *ddcSymbols[] = {
- "xf86PrintEDID",
- "xf86DoEDID_DDC2",
- "xf86SetDDCproperties",
- NULL
-};
-
-static const char *int10Symbols[] = {
- "xf86FreeInt10",
- "xf86InitInt10",
- "xf86ExecX86int10",
- NULL
-};
-
typedef enum {
OPTION_HW_CURSOR,
OPTION_NOACCEL,
@@ -248,7 +198,6 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
pNv->int10 = NULL;
pNv->int10Mode = 0;
if(xf86LoadSubModule(pScrn, "int10")) {
- xf86LoaderReqSymLists(int10Symbols, NULL);
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Initializing int10\n");
pNv->int10 = xf86InitInt10(pEnt->index);
}
@@ -447,7 +396,6 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
if(!xf86LoadSubModule(pScrn, "i2c")) goto fail;
if(!xf86LoadSubModule(pScrn, "ddc")) goto fail;
- xf86LoaderReqSymLists(i2cSymbols, ddcSymbols, NULL);
if(!G80DispPreInit(pScrn)) goto fail;
/* Read the DDC routing table and create outputs */
@@ -478,17 +426,14 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
/* Load fb */
if(!xf86LoadSubModule(pScrn, "fb")) goto fail;
- xf86LoaderReqSymLists(fbSymbols, NULL);
if(!pNv->NoAccel) {
switch(pNv->AccelMethod) {
case XAA:
if(!xf86LoadSubModule(pScrn, "xaa")) goto fail;
- xf86LoaderReqSymLists(xaaSymbols, NULL);
break;
case EXA:
if(!xf86LoadSubModule(pScrn, "exa")) goto fail;
- xf86LoaderReqSymLists(exaSymbols, NULL);
break;
}
}
@@ -499,8 +444,6 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to load ramdac. "
"Falling back to software cursor.\n");
pNv->HWCursor = FALSE;
- } else {
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
}
diff -up xf86-video-nv-2.1.13/src/nv_driver.c.abi xf86-video-nv-2.1.13/src/nv_driver.c
--- xf86-video-nv-2.1.13/src/nv_driver.c.abi 2009-06-23 10:28:53.000000000 +1000
+++ xf86-video-nv-2.1.13/src/nv_driver.c 2009-06-23 10:29:34.000000000 +1000
@@ -446,122 +446,6 @@ static SymTabRec NVKnownChipsets[] =
};
-/*
- * List of symbols from other modules that this module references. This
- * list is used to tell the loader that it is OK for symbols here to be
- * unresolved providing that it hasn't been told that they haven't been
- * told that they are essential via a call to xf86LoaderReqSymbols() or
- * xf86LoaderReqSymLists(). The purpose is this is to avoid warnings about
- * unresolved symbols that are not required.
- */
-
-static const char *vgahwSymbols[] = {
- "vgaHWUnmapMem",
- "vgaHWDPMSSet",
- "vgaHWFreeHWRec",
- "vgaHWGetHWRec",
- "vgaHWGetIndex",
- "vgaHWInit",
- "vgaHWMapMem",
- "vgaHWProtect",
- "vgaHWRestore",
- "vgaHWSave",
- "vgaHWSaveScreen",
- NULL
-};
-
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAACopyROP",
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAFallbackOps",
- "XAAInit",
- "XAAPatternROP",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-static const char *ddcSymbols[] = {
- "xf86PrintEDID",
- "xf86DoEDID_DDC2",
- "xf86SetDDCproperties",
- NULL
-};
-
-#ifdef XFree86LOADER
-static const char *vbeSymbols[] = {
- "VBEInit",
- "vbeFree",
- "vbeDoEDID",
- NULL
-};
-
-static const char *vbeModeSymbols[] = {
- "VBEExtendedInit",
- "VBEGetVBEInfo",
- "VBEGetModePool",
- "VBEValidateModes",
- "VBESetModeParameters",
- "VBEGetVBEMode",
- "VBESetVBEMode",
- NULL
-};
-#endif
-
-static const char *i2cSymbols[] = {
- "xf86CreateI2CBusRec",
- "xf86I2CBusInit",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
-static const char *fbdevHWSymbols[] = {
- "fbdevHWInit",
- "fbdevHWUseBuildinMode",
-
- "fbdevHWGetVidmem",
-
- /* colormap */
- "fbdevHWLoadPaletteWeak",
-
- /* ScrnInfo hooks */
- "fbdevHWAdjustFrameWeak",
- "fbdevHWEnterVT",
- "fbdevHWLeaveVTWeak",
- "fbdevHWModeInit",
- "fbdevHWSave",
- "fbdevHWSwitchModeWeak",
- "fbdevHWValidModeWeak",
-
- "fbdevHWMapMMIO",
- "fbdevHWMapVidmem",
-
- NULL
-};
-
-static const char *int10Symbols[] = {
- "xf86FreeInt10",
- "xf86InitInt10",
- NULL
-};
-
-
#ifdef XFree86LOADER
static MODULESETUPPROTO(nvSetup);
@@ -675,16 +559,6 @@ nvSetup(pointer module, pointer opts, in
* Modules that this driver always requires may be loaded here
* by calling LoadSubModule().
*/
-
- /*
- * Tell the loader about symbols from other modules that this module
- * might refer to.
- */
- LoaderRefSymLists(vgahwSymbols, xaaSymbols, fbSymbols,
- ramdacSymbols, shadowSymbols,
- i2cSymbols, ddcSymbols, vbeSymbols,
- fbdevHWSymbols, int10Symbols, NULL);
-
/*
* The return value must be non-NULL on success even though there
* is no TearDownProc.
@@ -1250,11 +1124,9 @@ Bool NVI2CInit(ScrnInfoPtr pScrn)
char *mod = "i2c";
if (xf86LoadSubModule(pScrn, mod)) {
- xf86LoaderReqSymLists(i2cSymbols,NULL);
mod = "ddc";
if(xf86LoadSubModule(pScrn, mod)) {
- xf86LoaderReqSymLists(ddcSymbols, NULL);
return NVDACi2cInit(pScrn);
}
}
@@ -1353,7 +1225,6 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
/* Initialize the card through int10 interface if needed */
if (xf86LoadSubModule(pScrn, "int10")) {
- xf86LoaderReqSymLists(int10Symbols, NULL);
#if !defined(__alpha__) && !defined(__powerpc__)
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Initializing int10\n");
pNv->pInt = xf86InitInt10(pNv->pEnt->index);
@@ -1489,8 +1360,6 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
}
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
-
/*
* Allocate a vgaHWRec
*/
@@ -1559,7 +1428,6 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
}
- xf86LoaderReqSymLists(fbdevHWSymbols, NULL);
if (!fbdevHWInit(pScrn, pNv->PciInfo, NULL)) {
xf86FreeInt10(pNv->pInt);
return FALSE;
@@ -1667,7 +1535,6 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
"enabled.\n");
return FALSE;
}
- xf86LoaderReqSymLists(vbeModeSymbols, NULL);
pNv->pVbe = VBEExtendedInit(NULL, pNv->pEnt->index,
SET_BIOS_SCRATCH | RESTORE_BIOS_SCRATCH);
if (!pNv->pVbe) return FALSE;
@@ -2000,8 +1867,6 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
-
/* Load XAA if needed */
if (!pNv->NoAccel) {
if (!xf86LoadSubModule(pScrn, "xaa")) {
@@ -2009,7 +1874,6 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
NVFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
/* Load ramdac if needed */
@@ -2019,7 +1883,6 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
NVFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
/* Load shadowfb if needed */
@@ -2029,7 +1892,6 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
NVFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
}
pNv->CurrentLayout.bitsPerPixel = pScrn->bitsPerPixel;
diff -up xf86-video-nv-2.1.13/src/riva_driver.c.abi xf86-video-nv-2.1.13/src/riva_driver.c
--- xf86-video-nv-2.1.13/src/riva_driver.c.abi 2009-06-23 10:30:29.000000000 +1000
+++ xf86-video-nv-2.1.13/src/riva_driver.c 2009-06-23 10:30:59.000000000 +1000
@@ -59,104 +59,6 @@ static void RivaSave(ScrnInfoPtr pScrn);
static void RivaRestore(ScrnInfoPtr pScrn);
static Bool RivaModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
-
-/*
- * List of symbols from other modules that this module references. This
- * list is used to tell the loader that it is OK for symbols here to be
- * unresolved providing that it hasn't been told that they haven't been
- * told that they are essential via a call to xf86LoaderReqSymbols() or
- * xf86LoaderReqSymLists(). The purpose is this is to avoid warnings about
- * unresolved symbols that are not required.
- */
-
-static const char *vgahwSymbols[] = {
- "vgaHWUnmapMem",
- "vgaHWDPMSSet",
- "vgaHWFreeHWRec",
- "vgaHWGetHWRec",
- "vgaHWGetIndex",
- "vgaHWInit",
- "vgaHWMapMem",
- "vgaHWProtect",
- "vgaHWRestore",
- "vgaHWSave",
- "vgaHWSaveScreen",
- NULL
-};
-
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAAGetCopyROP",
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAGetFallbackOps",
- "XAAInit",
- "XAAGetPatternROP",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-static const char *ddcSymbols[] = {
- "xf86PrintEDID",
- "xf86DoEDID_DDC2",
- "xf86SetDDCproperties",
- NULL
-};
-
-static const char *i2cSymbols[] = {
- "xf86CreateI2CBusRec",
- "xf86I2CBusInit",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
-static const char *fbdevHWSymbols[] = {
- "fbdevHWInit",
- "fbdevHWUseBuildinMode",
-
- "fbdevHWGetVidmem",
-
- /* colormap */
- "fbdevHWLoadPaletteWeak",
-
- /* ScrnInfo hooks */
- "fbdevHWAdjustFrameWeak",
- "fbdevHWEnterVT",
- "fbdevHWLeaveVTWeak",
- "fbdevHWModeInit",
- "fbdevHWSave",
- "fbdevHWSwitchModeWeak",
- "fbdevHWValidModeWeak",
-
- "fbdevHWMapMMIO",
- "fbdevHWMapVidmem",
-
- NULL
-};
-
-static const char *int10Symbols[] = {
- "xf86FreeInt10",
- "xf86InitInt10",
- NULL
-};
-
-
-
typedef enum {
OPTION_SW_CURSOR,
OPTION_HW_CURSOR,
@@ -412,11 +314,8 @@ Bool RivaI2CInit(ScrnInfoPtr pScrn)
char *mod = "i2c";
if (xf86LoadSubModule(pScrn, mod)) {
- xf86LoaderReqSymLists(i2cSymbols,NULL);
-
mod = "ddc";
if(xf86LoadSubModule(pScrn, mod)) {
- xf86LoaderReqSymLists(ddcSymbols, NULL);
return RivaDACi2cInit(pScrn);
}
}
@@ -489,7 +388,6 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags
/* Initialize the card through int10 interface if needed */
if (xf86LoadSubModule(pScrn, "int10")) {
- xf86LoaderReqSymLists(int10Symbols, NULL);
#if !defined(__alpha__)
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Initializing int10\n");
pRiva->pInt = xf86InitInt10(pRiva->pEnt->index);
@@ -575,8 +473,6 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags
return FALSE;
}
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
-
/*
* Allocate a vgaHWRec
*/
@@ -643,7 +539,6 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags
return FALSE;
}
- xf86LoaderReqSymLists(fbdevHWSymbols, NULL);
if (!fbdevHWInit(pScrn, pRiva->PciInfo, NULL)) {
xf86FreeInt10(pRiva->pInt);
return FALSE;
@@ -866,8 +761,6 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags
return FALSE;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
-
/* Load XAA if needed */
if (!pRiva->NoAccel) {
if (!xf86LoadSubModule(pScrn, "xaa")) {
@@ -875,7 +768,6 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags
RivaFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
/* Load ramdac if needed */
@@ -885,7 +777,6 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags
RivaFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
/* Load shadowfb if needed */
@@ -895,7 +786,6 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags
RivaFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
}
pRiva->CurrentLayout.bitsPerPixel = pScrn->bitsPerPixel;
Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/xorg-x11-drv-nv.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- xorg-x11-drv-nv.spec 7 Apr 2009 17:57:42 -0000 1.85
+++ xorg-x11-drv-nv.spec 23 Jun 2009 00:33:33 -0000 1.86
@@ -5,7 +5,7 @@
Summary: Xorg X11 nv video driver
Name: xorg-x11-drv-nv
Version: 2.1.13
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -28,6 +28,7 @@ Patch6: nv-2.1.6-panel-fix.patch
Patch7: nv-save-rom.patch
Patch9: nv-2.1.8-g80-no-doublescan.patch
Patch10: nv-2.1.12-gf7025-gf7050.patch
+Patch11: abi.patch
%description
X.Org X11 nv video driver.
@@ -41,6 +42,7 @@ X.Org X11 nv video driver.
%patch7 -p1 -b .save-rom
%patch9 -p1 -b .doublescan
%patch10 -p1 -b .nv6x
+%patch11 -p1 -b .abi
%build
%configure --disable-static
@@ -67,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man4/nv.4*
%changelog
+* Tue Jun 23 2009 Dave Airlie <airlied at redhat.com> 2.1.13-2
+- patch for new server ABI
+
* Tue Apr 07 2009 Adam Jackson <ajax at redhat.com> 2.1.13-1
- nv 2.1.13
- nv.xinf: Add 7025/7050.
- Previous message (by thread): rpms/xorg-x11-drv-mga/devel abi.patch, NONE, 1.1 sources, 1.12, 1.13 xorg-x11-drv-mga.spec, 1.30, 1.31 mga-1.4.7-alloca.patch, 1.1, NONE mga-1.4.7-death-to-cfb.patch, 1.1, NONE
- Next message (by thread): rpms/gettext/F-11 gettext.spec,1.93,1.94
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list