[CVS] ati.2 radeon_video.c,1.97,1.98

Update of /cvsroot/gatos/ati.2
In directory sc8-pr-cvs1:/tmp/cvs-serv17410

Modified Files:
	radeon_video.c 
Log Message:
Merge patch from Dmitri Katchalov.


Index: radeon_video.c
===================================================================
RCS file: /cvsroot/gatos/ati.2/radeon_video.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- radeon_video.c	1 Dec 2003 20:56:50 -0000	1.97
+++ radeon_video.c	2 Dec 2003 19:04:51 -0000	1.98
@@ -948,22 +948,22 @@
 
     /* reset status flags */
     RADEONWaitForIdleMMIO(pScrn);
-    reg = INREG8 (RADEON_I2C_CNTL_0 + 0) & 0xF8;
+    reg = INREG8 (RADEON_I2C_CNTL_0 + 0) & ~(I2C_DONE|I2C_NACK|I2C_HALT);
     OUTREG8 (RADEON_I2C_CNTL_0 + 0, reg);
 
     /* issue ABORT call */
     RADEONWaitForIdleMMIO(pScrn);
     reg = INREG8 (RADEON_I2C_CNTL_0 + 1) & 0xE7;
-    OUTREG8 (RADEON_I2C_CNTL_0 + 1, (reg | 0x18));
+    OUTREG8 (RADEON_I2C_CNTL_0 + 1, (reg |((I2C_GO|I2C_ABORT) >> 8)));
 
     /* wait for GO bit to go low */
     RADEONWaitForIdleMMIO(pScrn);
-    while (INREG8 (RADEON_I2C_CNTL_0 + 0) & I2C_GO)
+    while (INREG8 (RADEON_I2C_CNTL_0 + 1) & (I2C_GO>>8))
     {
       counter++;
       if(counter>1000000)return;
     }
-} 
+}
 
 
 static Bool RADEONI2CWriteRead(I2CDevPtr d, I2CByte *WriteBuffer, int nWrite,