rpms/xorg-x11-drv-i740/devel i740-pciaccess.patch, 1.1, 1.2 xorg-x11-drv-i740.spec, 1.17, 1.18

[Dave Airlie (airlied)]

Author: airlied

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

Modified Files:
	i740-pciaccess.patch xorg-x11-drv-i740.spec 
Log Message:
* Mon Mar 10 2008 Dave Airlie <airlied at redhat.com> 1.1.0-8
- fix some bugs in pciaccess conversion


i740-pciaccess.patch:

Index: i740-pciaccess.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i740/devel/i740-pciaccess.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- i740-pciaccess.patch	10 Mar 2008 02:30:24 -0000	1.1
+++ i740-pciaccess.patch	10 Mar 2008 04:40:40 -0000	1.2
@@ -50,7 +50,7 @@
    I740RegRec SavedReg;
    I740RegRec ModeReg;
 diff --git a/src/i740_driver.c b/src/i740_driver.c
-index c21163d..ee25967 100644
+index c21163d..f118637 100644
 --- a/src/i740_driver.c
 +++ b/src/i740_driver.c
 @@ -142,9 +142,9 @@ static Bool I740UnmapMem(ScrnInfoPtr pScrn);
@@ -66,7 +66,21 @@
  
  _X_EXPORT DriverRec I740 = {
    I740_VERSION,
-@@ -508,8 +508,10 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
+@@ -378,11 +378,13 @@ I740Probe(DriverPtr drv, int flags) {
+     return FALSE;
+   }
+ 
++#ifndef XSERVER_LIBPCIACCESS
+   /* 
+      Since these Probing is just checking the PCI data the server already
+      collected.
+   */
+   if (!xf86GetPciVideoInfo()) return FALSE;
++#endif
+  
+   /* Look for Intel based chips */
+   numUsed = xf86MatchPciInstances(I740_NAME, PCI_VENDOR_INTEL,
+@@ -508,8 +510,10 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
    if (!vgaHWGetHWRec(pScrn)) return FALSE;
  
    pI740->PciInfo = xf86GetPciInfoForEntity(pI740->pEnt->index);
@@ -77,16 +91,16 @@
  
    if (xf86RegisterResources(pI740->pEnt->index, 0, ResNone))
        return FALSE;
-@@ -598,7 +600,7 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
+@@ -598,7 +602,7 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
  	       pI740->pEnt->device->chipID);
    } else {
      from = X_PROBED;
 -    pScrn->chipset = (char *)xf86TokenToString(I740Chipsets, pI740->PciInfo->chipType);
-+    pScrn->chipset = (char *)xf86TokenToString(I740Chipsets, PCI_DEV_DEVIE_ID(pI740->PciInfo));
++    pScrn->chipset = (char *)xf86TokenToString(I740Chipsets, PCI_DEV_DEVICE_ID(pI740->PciInfo));
    }
    if (pI740->pEnt->device->chipRev >= 0) {
      xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
-@@ -611,8 +613,8 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
+@@ -611,8 +615,8 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
      pI740->LinearAddr = pI740->pEnt->device->MemBase;
      from = X_CONFIG;
    } else {
@@ -97,7 +111,7 @@
        from = X_PROBED;
      } else {
        xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 
-@@ -628,8 +630,8 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
+@@ -628,8 +632,8 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
      pI740->MMIOAddr = pI740->pEnt->device->IOBase;
      from = X_CONFIG;
    } else {
@@ -108,7 +122,7 @@
        from = X_PROBED;
      } else {
        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-@@ -871,18 +873,48 @@ static Bool I740MapMem(ScrnInfoPtr pScrn)
+@@ -871,18 +875,48 @@ static Bool I740MapMem(ScrnInfoPtr pScrn)
  
    pI740 = I740PTR(pScrn);
  
@@ -157,7 +171,7 @@
    if (!pI740->FbBase) return FALSE;
  
    return TRUE;
-@@ -894,10 +926,18 @@ static Bool I740UnmapMem(ScrnInfoPtr pScrn)
+@@ -894,10 +928,18 @@ static Bool I740UnmapMem(ScrnInfoPtr pScrn)
  
    pI740 = I740PTR(pScrn);
  
@@ -178,7 +192,7 @@
  }
 diff --git a/src/i740_pcirename.h b/src/i740_pcirename.h
 new file mode 100644
-index 0000000..cbd3dcf
+index 0000000..e783713
 --- /dev/null
 +++ b/src/i740_pcirename.h
 @@ -0,0 +1,122 @@
@@ -210,8 +224,8 @@
 + * library. The main purpose being to facilitate source code compatibility.
 + */
 +
-+#ifndef ASTPCIRENAME_H
-+#define ASTPCIRENAME_H
++#ifndef I740PCIRENAME_H
++#define I740PCIRENAME_H
 +
 +enum region_type {
 +    REGION_MEM,
@@ -303,4 +317,4 @@
 +
 +#endif /* XSERVER_LIBPCIACCESS */
 +
-+#endif /* CIRPCIRENAME_H */
++#endif /* i740PCIRENAME_H */


Index: xorg-x11-drv-i740.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i740/devel/xorg-x11-drv-i740.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xorg-x11-drv-i740.spec	10 Mar 2008 02:30:24 -0000	1.17
+++ xorg-x11-drv-i740.spec	10 Mar 2008 04:40:40 -0000	1.18
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 i740 video driver
 Name:      xorg-x11-drv-i740
 Version:   1.1.0
-Release:   7%{?dist}
+Release:   8%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -58,6 +58,9 @@
 %{_mandir}/man4/i740.4*
 
 %changelog
+* Mon Mar 10 2008 Dave Airlie <airlied at redhat.com> 1.1.0-8
+- fix some bugs in pciaccess conversion
+
 * Mon Mar 10 2008 Dave Airlie <airlied at redhat.com> 1.1.0-7
 - pciaccess conversion