rpms/xorg-x11-drv-sis/devel sis-pciaccess.patch, 1.1, 1.2 xorg-x11-drv-sis.spec, 1.23, 1.24

[Dave Airlie (airlied)]

Author: airlied

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

Modified Files:
	sis-pciaccess.patch xorg-x11-drv-sis.spec 
Log Message:
* Wed Jan 16 2008 Dave Airlie <airlied at redhat.com> - 0.9.4-2
- fixup bugs in pciaccess port


sis-pciaccess.patch:

Index: sis-pciaccess.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sis/devel/sis-pciaccess.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sis-pciaccess.patch	16 Jan 2008 03:44:54 -0000	1.1
+++ sis-pciaccess.patch	16 Jan 2008 07:51:53 -0000	1.2
@@ -996,20 +996,16 @@
  	  xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
  	   	"Shared Memory Area is on DIMM%d\n", ramtype);
 diff --git a/src/sis_vga.c b/src/sis_vga.c
-index 9275f21..665db08 100644
+index 9275f21..03cf069 100644
 --- a/src/sis_vga.c
 +++ b/src/sis_vga.c
-@@ -1717,8 +1717,17 @@ SiSVGAMapMem(ScrnInfoPtr pScrn)
+@@ -1717,8 +1717,13 @@ SiSVGAMapMem(ScrnInfoPtr pScrn)
      if(pSiS->VGAMapPhys == 0) pSiS->VGAMapPhys = 0xA0000;
  
  #if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0)
 +#if XSERVER_LIBPCIACCESS
-+    /* XXX This is cacheable, right? Right? */
-+    if(pci_device_map_range(pSiS->PciInfo, pSiS->VGAMapPhys, pSiS->VGAMapSize,
-+                       PCI_DEV_MAP_FLAG_WRITABLE|PCI_DEV_MAP_FLAG_CACHABLE,
-+                       &pSiS->VGAMemBase)) {
-+        return FALSE;
-+    }
++    pSiS->VGAMemBase = xf86MapDomainMemory(pScrn->scrnIndex, VIDMEM_MMIO_32BIT,
++			pSiS->PciInfo, pSiS->VGAMapPhys, pSiS->VGAMapSize);
 +#else
      pSiS->VGAMemBase = xf86MapDomainMemory(pScrn->scrnIndex, VIDMEM_MMIO_32BIT,
  			pSiS->PciTag, pSiS->VGAMapPhys, pSiS->VGAMapSize);
@@ -1017,19 +1013,6 @@
  #else
      pSiS->VGAMemBase = xf86MapVidMem(pScrn->scrnIndex, VIDMEM_MMIO_32BIT,
  			pSiS->VGAMapPhys, pSiS->VGAMapSize);
-@@ -1733,8 +1742,11 @@ SiSVGAUnmapMem(ScrnInfoPtr pScrn)
-     SISPtr pSiS = SISPTR(pScrn);
- 
-     if(pSiS->VGAMemBase == NULL) return;
--
-+#if XSERVER_LIBPCIACCESS
-+    pci_device_unmap_range(pSiS->PciInfo, pSiS->VGAMemBase, pSiS->VGAMapSize);
-+#else
-     xf86UnMapVidMem(pScrn->scrnIndex, pSiS->VGAMemBase, pSiS->VGAMapSize);
-+#endif
-     pSiS->VGAMemBase = NULL;
- }
- #endif
 diff --git a/src/sispcirename.h b/src/sispcirename.h
 new file mode 100644
 index 0000000..c4beac6


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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xorg-x11-drv-sis.spec	16 Jan 2008 03:44:54 -0000	1.23
+++ xorg-x11-drv-sis.spec	16 Jan 2008 07:51:53 -0000	1.24
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 sis video driver
 Name:      xorg-x11-drv-sis
 Version:   0.9.4
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -62,6 +62,9 @@
 %{_mandir}/man4/sis.4*
 
 %changelog
+* Wed Jan 16 2008 Dave Airlie <airlied at redhat.com> - 0.9.4-2
+- fixup bugs in pciaccess port
+
 * Wed Jan 16 2008 Dave Airlie <airlied at redhat.com> - 0.9.4-1
 - new upstream version
 - sis-pciaccess.patch - add initial pciaccess port