[xorg-x11-drv-s3virge] ABI rebuild s3virge-1.10.4-vga.patch: Adapt to videoabi 12

[Adam Jackson]

commit 7d01f746e26f78f0aceef9b4342d0a3fa51b0d66
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Nov 16 20:00:42 2011 -0500

    ABI rebuild
    s3virge-1.10.4-vga.patch: Adapt to videoabi 12

 s3virge-1.10.4-vga.patch  |   76 +++++++++++++++++++++++++++++++++++++++++++++
 xorg-x11-drv-s3virge.spec |    8 +++-
 2 files changed, 82 insertions(+), 2 deletions(-)
---
diff --git a/s3virge-1.10.4-vga.patch b/s3virge-1.10.4-vga.patch
new file mode 100644
index 0000000..3fb1fd6
--- /dev/null
+++ b/s3virge-1.10.4-vga.patch
@@ -0,0 +1,76 @@
+From 92b4671ca75022a56ad9e85b347f81c12157c98f Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Wed, 16 Nov 2011 19:58:29 +0000
+Subject: Adapt to missing PIOOffset in videoabi 12
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/s3v_driver.c b/src/s3v_driver.c
+index 2ced9ac..0f754dd 100644
+--- a/src/s3v_driver.c
++++ b/src/s3v_driver.c
+@@ -3516,11 +3516,17 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
+   S3VPtr ps3v;
+   IOADDRESS vgaCRIndex, vgaCRReg;
+   unsigned char val;
+-  
++  unsigned int PIOOffset = 0;
++
+   PVERB5("	S3VEnableMmio\n");
+   
+   hwp = VGAHWPTR(pScrn);
+   ps3v = S3VPTR(pScrn);
++
++#if ABI_VIDEODRV_VERSION < 12
++  PIOOffset = hwp->PIOOffset;
++#endif
++  
+   /*
+    * enable chipset (seen on uninitialized secondary cards)
+    * might not be needed once we use the VGA softbooter
+@@ -3533,17 +3539,17 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
+    * to be set correctly already and MMIO _has_ to be
+    * enabled.
+    */
+-  val = inb(hwp->PIOOffset + 0x3C3);               /*@@@EE*/
+-  outb(hwp->PIOOffset + 0x3C3, val | 0x01);
++  val = inb(PIOOffset + 0x3C3);               /*@@@EE*/
++  outb(PIOOffset + 0x3C3, val | 0x01);
+   /*
+    * set CR registers to color mode
+    * in mono mode extended CR registers
+    * are not accessible. (EE 05/04/99)
+    */
+-  val = inb(hwp->PIOOffset + VGA_MISC_OUT_R);      /*@@@EE*/
+-  outb(hwp->PIOOffset + VGA_MISC_OUT_W, val | 0x01);
++  val = inb(PIOOffset + VGA_MISC_OUT_R);      /*@@@EE*/
++  outb(PIOOffset + VGA_MISC_OUT_W, val | 0x01);
+   vgaHWGetIOBase(hwp);             	/* Get VGA I/O base */
+-  vgaCRIndex = hwp->PIOOffset + hwp->IOBase + 4;
++  vgaCRIndex = PIOOffset + hwp->IOBase + 4;
+   vgaCRReg = vgaCRIndex + 1;
+ #if 1
+   /*
+@@ -3562,7 +3568,7 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
+   			      	/* Enable new MMIO, if TRIO mmio is already */
+ 				/* enabled, then it stays enabled. */
+   outb(vgaCRReg, ps3v->EnableMmioCR53 | 0x08);
+-  outb(hwp->PIOOffset + VGA_MISC_OUT_W, val);
++  outb(PIOOffset + VGA_MISC_OUT_W, val);
+   if (S3_TRIO_3D_SERIES(ps3v->Chipset)) {
+     outb(vgaCRIndex, 0x40);
+     val = inb(vgaCRReg);
+@@ -3584,7 +3590,10 @@ S3VDisableMmio(ScrnInfoPtr pScrn)
+   hwp = VGAHWPTR(pScrn);
+   ps3v = S3VPTR(pScrn);
+ 
+-  vgaCRIndex = hwp->PIOOffset + hwp->IOBase + 4;
++  vgaCRIndex = hwp->IOBase + 4;
++#if ABI_VIDEODRV_VERSION < 12
++  vgaCRIndex += hwp->PIOOffset;
++#endif
+   vgaCRReg = vgaCRIndex + 1;
+   outb(vgaCRIndex, 0x53);
+ 				/* Restore register's original state */
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/xorg-x11-drv-s3virge.spec b/xorg-x11-drv-s3virge.spec
index d0bf696..278f16a 100644
--- a/xorg-x11-drv-s3virge.spec
+++ b/xorg-x11-drv-s3virge.spec
@@ -13,6 +13,8 @@ Group:     User Interface/X Hardware Support
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   s3virge.xinf
 
+Patch0:	    s3virge-1.10.4-vga.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.10.99.902
@@ -26,10 +28,11 @@ X.Org X11 s3virge video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .vga
 
 %build
 %configure --disable-static
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -53,8 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/s3virge.4*
 
 %changelog
-* Wed Nov 09 2011 ajax <ajax at redhat.com> - 1.10.4-10
+* Wed Nov 16 2011 Adam Jackson <ajax at redhat.com> 1.10.4-10
 - ABI rebuild
+- s3virge-1.10.4-vga.patch: Adapt to videoabi 12
 
 * Thu Aug 18 2011 Adam Jackson <ajax at redhat.com> - 1.10.4-9
 - Rebuild for xserver 1.11 ABI