Index: i830_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c,v
retrieving revision 1.10
diff -u -r1.10 i830_driver.c
--- i830_driver.c	10 Jan 2005 11:29:02 -0000	1.10
+++ i830_driver.c	8 Feb 2005 23:14:44 -0000
@@ -1584,6 +1606,9 @@
    /* single pipe machines should always return TRUE */
    if (pI830->availablePipes == 1) return TRUE;
 
+   /* Don't set the pipe if we're current */
+   if (GetBIOSPipe(pScrn) == pI830->pipe) return TRUE;
+
    pVbe->pInt10->num = 0x10;
    pVbe->pInt10->ax = 0x5f1c;
    if (pI830->newPipeSwitch) {