rpms/xorg-x11-drv-neomagic/devel neomagic-1.1.1-pciaccess.patch, 1.1, 1.2 xorg-x11-drv-neomagic.spec, 1.15, 1.16

Dave Airlie (airlied) fedora-extras-commits at redhat.com
Mon Mar 10 05:44:00 UTC 2008


Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-neomagic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6246

Modified Files:
	neomagic-1.1.1-pciaccess.patch xorg-x11-drv-neomagic.spec 
Log Message:
* Mon Mar 10 2008 Dave Airlie <airlied at redhat.com> 1.1.1-7
- fixup neomagic pciaccess support


neomagic-1.1.1-pciaccess.patch:

Index: neomagic-1.1.1-pciaccess.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-neomagic/devel/neomagic-1.1.1-pciaccess.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- neomagic-1.1.1-pciaccess.patch	27 Feb 2008 01:47:49 -0000	1.1
+++ neomagic-1.1.1-pciaccess.patch	10 Mar 2008 05:43:55 -0000	1.2
@@ -2,6 +2,14 @@
 index 50c0a20..1b0f433 100644
 --- a/configure.ac
 +++ b/configure.ac
+@@ -47,6 +47,7 @@ AC_ARG_WITH(xorg-module-dir,
+             [moduledir="$withval"],
+             [moduledir="$libdir/xorg/modules"])
+ 
++
+ # Checks for extensions
+ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+ XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
 @@ -59,10 +60,22 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_M
  sdkdir=$(pkg-config --variable=sdkdir xorg-server)
  
@@ -61,7 +69,7 @@
      XAAInfoRecPtr	AccelInfoRec;
      NEOACLRec Accel;
 diff --git a/src/neo_driver.c b/src/neo_driver.c
-index 1fca1f5..3d18916 100644
+index 1fca1f5..fec51ce 100644
 --- a/src/neo_driver.c
 +++ b/src/neo_driver.c
 @@ -158,9 +158,9 @@ static int      neoFindMode(int xres, int yres, int depth);
@@ -77,7 +85,19 @@
  
  /*
   * This is intentionally screen-independent.  It indicates the binding
-@@ -778,9 +778,11 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -612,7 +612,10 @@ NEOProbe(DriverPtr drv, int flags)
+     }
+   
+     /* PCI BUS */
+-    if (xf86GetPciVideoInfo() ) {
++#ifndef XSERVER_LIBPCIACCESS
++    if (xf86GetPciVideoInfo() )
++#endif
++    {
+ 	numUsed = xf86MatchPciInstances(NEO_NAME, PCI_VENDOR_NEOMAGIC,
+ 					NEOChipsets, NEOPCIchipsets, 
+ 					devSections,numDevSections,
+@@ -778,9 +781,11 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
  	/* This driver can handle ISA and PCI buses */
  	if (nPtr->pEnt->location.type == BUS_PCI) {
  	    nPtr->PciInfo = xf86GetPciInfoForEntity(nPtr->pEnt->index);
@@ -89,7 +109,7 @@
  	}
      }
      xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Chipset is a ");
-@@ -1221,7 +1223,7 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -1221,7 +1226,7 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
  	
      if (nPtr->pEnt->location.type == BUS_PCI) {
  	if (!nPtr->NeoLinearAddr) {
@@ -98,7 +118,7 @@
  	    xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
  		       "FB base address is set at 0x%lX.\n",
  		       nPtr->NeoLinearAddr);
-@@ -1241,8 +1243,8 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -1241,8 +1246,8 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
  	    case NM2230:
  	    case NM2360:
  	    case NM2380:
@@ -109,7 +129,7 @@
  		break;
  	    }
  	    xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
-@@ -2057,6 +2059,8 @@ neoMapMem(ScrnInfoPtr pScrn)
+@@ -2057,6 +2062,8 @@ neoMapMem(ScrnInfoPtr pScrn)
      if (!nPtr->noLinear) {
  	if (!nPtr->noMMIO) {
  	    if (nPtr->pEnt->location.type == BUS_PCI){
@@ -118,7 +138,7 @@
  		nPtr->NeoMMIOBase =
  		    xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
  				  nPtr->PciTag, nPtr->NeoMMIOAddr,
-@@ -2067,6 +2071,29 @@ neoMapMem(ScrnInfoPtr pScrn)
+@@ -2067,6 +2074,29 @@ neoMapMem(ScrnInfoPtr pScrn)
  				      nPtr->PciTag, nPtr->NeoMMIOAddr2,
  				      0x100000L);
  		}
@@ -148,7 +168,7 @@
  	    } else
  		nPtr->NeoMMIOBase =
  		    xf86MapVidMem(pScrn->scrnIndex,
-@@ -2077,11 +2104,26 @@ neoMapMem(ScrnInfoPtr pScrn)
+@@ -2077,11 +2107,26 @@ neoMapMem(ScrnInfoPtr pScrn)
  	}
  
  	if (nPtr->pEnt->location.type == BUS_PCI)
@@ -175,6 +195,37 @@
  	else
  	    nPtr->NeoFbBase =
  		xf86MapVidMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
+@@ -2106,16 +2151,30 @@ neoUnmapMem(ScrnInfoPtr pScrn)
+     NEOPtr nPtr = NEOPTR(pScrn);
+ 
+     if (!nPtr->noLinear) {
++#ifndef XSERVER_LIBPCIACCESS
+       if (nPtr->NeoMMIOBase)
+ 	  xf86UnMapVidMem(pScrn->scrnIndex, (pointer)nPtr->NeoMMIOBase,
+ 			  0x200000L);
++#else
++      if (nPtr->NeoMMIOBase)
++	  pci_device_unmap_range(nPtr->PciInfo, (pointer)nPtr->NeoMMIOBase, 0x200000L);
++#endif
+       nPtr->NeoMMIOBase = NULL;
++#ifndef XSERVER_LIBPCIACCESS
+       if (nPtr->NeoMMIOBase2)
+ 	  xf86UnMapVidMem(pScrn->scrnIndex, (pointer)nPtr->NeoMMIOBase2,
+ 			  0x100000L);
++#else
++      if (nPtr->NeoMMIOBase2)
++	  pci_device_unmap_range(nPtr->PciInfo, (pointer)nPtr->NeoMMIOBase2, 0x100000L);
++#endif
+       nPtr->NeoMMIOBase2 = NULL;
++#ifndef XSERVER_LIBPCIACCESS
+       xf86UnMapVidMem(pScrn->scrnIndex, (pointer)nPtr->NeoFbBase,
+ 		    nPtr->NeoFbMapSize); 
++#else
++      pci_device_unmap_range(nPtr->PciInfo, (pointer)nPtr->NeoFbBase, nPtr->NeoFbMapSize);
++#endif
+     }
+     nPtr->NeoFbBase = NULL;
+     
 diff --git a/src/neo_pcirename.h b/src/neo_pcirename.h
 new file mode 100644
 index 0000000..f0f5cf8


Index: xorg-x11-drv-neomagic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-neomagic/devel/xorg-x11-drv-neomagic.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-drv-neomagic.spec	27 Feb 2008 01:47:49 -0000	1.15
+++ xorg-x11-drv-neomagic.spec	10 Mar 2008 05:43:55 -0000	1.16
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 neomagic video driver
 Name:      xorg-x11-drv-neomagic
 Version:   1.1.1
-Release:   6%{?dist}
+Release:   7%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -60,6 +60,9 @@
 %{_mandir}/man4/neomagic.4*
 
 %changelog
+* Mon Mar 10 2008 Dave Airlie <airlied at redhat.com> 1.1.1-7
+- fixup neomagic pciaccess support
+
 * Wed Feb 27 2008 Dave Airlie <airlied at redhat.com> - 1.1.1-6
 - add pciaccess support
 




More information about the fedora-extras-commits mailing list