rpms/xorg-x11-drv-sis/devel sis-pciaccess.patch, 1.2, 1.3 xorg-x11-drv-sis.spec, 1.24, 1.25

[Dave Airlie (airlied)]

Author: airlied

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

Modified Files:
	sis-pciaccess.patch xorg-x11-drv-sis.spec 
Log Message:
* Thu Jan 17 2008 Dave Airlie <airlied at redhat.com> - 0.9.4-3
- fix more bugs in pciaccess port - tested on actual hardware.


sis-pciaccess.patch:

Index: sis-pciaccess.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sis/devel/sis-pciaccess.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sis-pciaccess.patch	16 Jan 2008 07:51:53 -0000	1.2
+++ sis-pciaccess.patch	17 Jan 2008 05:52:41 -0000	1.3
@@ -247,7 +247,7 @@
       break;
    }
 diff --git a/src/sis_driver.c b/src/sis_driver.c
-index 3cc3be8..0b3225a 100644
+index 3cc3be8..6667185 100644
 --- a/src/sis_driver.c
 +++ b/src/sis_driver.c
 @@ -555,7 +555,7 @@ SiS_SiSFB_Lock(ScrnInfoPtr pScrn, Bool lock)
@@ -573,7 +573,7 @@
                          pSiS->PciTag, pSiS->IOAddress, (pSiS->mmioSize * 1024));
 +#else
 +       {
-+	     void **result = (void **)&pSiSEnt->IOBase;
++	     void **result = (void **)&pSiS->IOBase;
 +	     int err = pci_device_map_range(pSiS->PciInfo,
 + 	                                    pSiS->IOAddress,
 +	                                    (pSiS->mmioSize * 1024),
@@ -619,7 +619,7 @@
 +	     pSiS->IOBaseDense = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
                      pSiS->PciTag, pSiS->IOAddress, (pSiS->mmioSize * 1024));
 +#else
-+	     void **result = (void **)&pSiSEnt->IOBaseDense;
++	     void **result = (void **)&pSiS->IOBaseDense;
 +	     int err = pci_device_map_range(pSiS->PciInfo,
 + 	                                    pSiS->IOAddress,
 +	                                    (pSiS->mmioSize * 1024),
@@ -668,7 +668,7 @@
 -		xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
 +
 +#ifndef XSERVER_LIBPCIACCESS
-+      pSiSEnt->FbBase = pSiSEnt->RealFbBase =
++      pSiS->FbBase = pSiS->RealFbBase =
 +			xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
  			 pSiS->PciTag, (ULong)pSiS->realFbAddress,
  			 pSiS->FbMapSize);
@@ -678,14 +678,14 @@
 +                                   pSiS->FbMapSize,
 +                                   PCI_DEV_MAP_FLAG_WRITABLE |
 +                                   PCI_DEV_MAP_FLAG_WRITE_COMBINE,
-+                                   (void *)&pSiSEnt->FbBase);
++                                   (void *)&pSiS->FbBase);
 +	if (err) {
 +            xf86DrvMsg (pScrn->scrnIndex, X_ERROR,
 +                        "Unable to map FB aperture. %s (%d)\n",
 +                        strerror (err), err);
 +            return FALSE;
 +        }
-+	pSiSEnt->RealFbBase = pSiSEnt->FbBase;
++	pSiS->RealFbBase = pSiS->FbBase;
 +#endif
  	pSiS->FbBase += pSiS->dhmOffset;
 +


Index: xorg-x11-drv-sis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sis/devel/xorg-x11-drv-sis.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xorg-x11-drv-sis.spec	16 Jan 2008 07:51:53 -0000	1.24
+++ xorg-x11-drv-sis.spec	17 Jan 2008 05:52:41 -0000	1.25
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 sis video driver
 Name:      xorg-x11-drv-sis
 Version:   0.9.4
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -62,6 +62,9 @@
 %{_mandir}/man4/sis.4*
 
 %changelog
+* Thu Jan 17 2008 Dave Airlie <airlied at redhat.com> - 0.9.4-3
+- fix more bugs in pciaccess port - tested on actual hardware.
+
 * Wed Jan 16 2008 Dave Airlie <airlied at redhat.com> - 0.9.4-2
 - fixup bugs in pciaccess port