Re: [iBook FW] Lost X with move from -3 to -4

[Michel Dänzer <michdaen@iiic.ethz.ch>]

Branden Robinson wrote:
> 
> On Thu, Sep 06, 2001 at 01:12:46AM +0200, Michel Dänzer wrote:
> > Branden Robinson wrote:
> > > No, I had to remove it.  It broke r128 for everybody with an Intel box.
> >
> > Who cares? ;)
> 
> I should have mentioned this before, but see bugs: #107349, #107383,
> #107412, #108601, #108659.
> 
> I guess there is something subtly wrong with the patch.

I have a suspicion; can you have someone test the attached patch?


-- 
Earthling Michel Dänzer (MrCooper)    \   Debian GNU/Linux (powerpc) developer
CS student, Free Software enthusiast   \        XFree86 and DRI project member

Index: r128_driver.c
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c,v
retrieving revision 1.29.2.1
diff -u -r1.29.2.1 r128_driver.c
--- r128_driver.c	2001/05/24 19:43:39	1.29.2.1
+++ r128_driver.c	2001/09/06 18:53:29
@@ -192,6 +192,7 @@
     "vgaHWUnlock",
     "vgaHWSave",
     "vgaHWRestore",
+    "vgaHWGetIOBase",
     NULL
 };
 
@@ -1378,6 +1389,8 @@
 	return FALSE;
     }
 
+    vgaHWGetIOBase(VGAHWPTR(pScrn));
+
     info->PciInfo      = xf86GetPciInfoForEntity(info->pEnt->index);
     info->PciTag       = pciTag(info->PciInfo->bus,
 				info->PciInfo->device,
@@ -2321,7 +2336,10 @@
 	return;
     }
     vgaHWUnlock(hwp);
-    vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_ALL); /* save mode, fonts, cmap */
+    if (info->VBIOS)
+        vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_ALL); /* save mode, fonts, cmap */
+    else
+        vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE); /* save mode */
     vgaHWLock(hwp);
 
     R128SaveMode(pScrn, save);