SOURCES: xorg-driver-video-ati-radeon-ddc6.patch (NEW) Handle DDC ...

[arekm]

Author: arekm                        Date: Sat Oct  6 10:09:59 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
Handle DDC 6 so DDC/EDID works.

---- Files affected:
SOURCES:
   xorg-driver-video-ati-radeon-ddc6.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/xorg-driver-video-ati-radeon-ddc6.patch
diff -u /dev/null SOURCES/xorg-driver-video-ati-radeon-ddc6.patch:1.1
--- /dev/null	Sat Oct  6 12:09:59 2007
+++ SOURCES/xorg-driver-video-ati-radeon-ddc6.patch	Sat Oct  6 12:09:54 2007
@@ -0,0 +1,95 @@
+diff --git a/src/radeon_bios.c b/src/radeon_bios.c
+index 65c2bb0..ff0f915 100644
+--- a/src/radeon_bios.c
++++ b/src/radeon_bios.c
+@@ -277,7 +277,7 @@ static Bool RADEONGetLegacyConnectorInfoFromBIOS (ScrnInfoPtr pScrn)
+ 		    tmp1 = RADEON_BIOS8(tmp0+2) & 0x07;
+ 		    if (tmp1) {	    
+ 			info->BiosConnector[4].DDCType	= tmp1;      
+-			if (info->BiosConnector[4].DDCType > DDC_LCD) {
++			if (info->BiosConnector[4].DDCType > DDC_GPIO) {
+ 			    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ 				       "Unknown DDCType %d found\n",
+ 				       info->BiosConnector[4].DDCType);
+diff --git a/src/radeon_output.c b/src/radeon_output.c
+index a6da78e..8f9135d 100644
+--- a/src/radeon_output.c
++++ b/src/radeon_output.c
+@@ -75,13 +75,14 @@ const char *TMDSTypeName[4] = {
+   "None"
+ };
+ 
+-const char *DDCTypeName[6] = {
++const char *DDCTypeName[7] = {
+   "None",
+   "MONID",
+   "DVI_DDC",
+   "VGA_DDC",
+   "CRT2_DDC",
+-  "LCD_DDC"
++  "LCD_DDC",
++  "GPIO_DDC"
+ };
+ 
+ const char *DACTypeName[4] = {
+@@ -277,7 +278,7 @@ RADEONDisplayDDCConnected(ScrnInfoPtr pScrn, xf86OutputPtr output)
+     DDCReg = radeon_output->DDCReg;
+ 
+     /* Read and output monitor info using DDC2 over I2C bus */
+-    if (radeon_output->pI2CBus && info->ddc2 && (DDCReg != RADEON_LCD_GPIO_MASK)) {
++    if (radeon_output->pI2CBus && info->ddc2 && (DDCReg != RADEON_LCD_GPIO_MASK) && (DDCReg != RADEON_MDGPIO_EN_REG)) {
+ 	OUTREG(DDCReg, INREG(DDCReg) &
+ 	       (CARD32)~(RADEON_GPIO_A_0 | RADEON_GPIO_A_1));
+ 
+@@ -331,7 +332,7 @@ RADEONDisplayDDCConnected(ScrnInfoPtr pScrn, xf86OutputPtr output)
+ 	    usleep(15000);
+ 	    if(*MonInfo)  break;
+ 	}
+-    } else if (radeon_output->pI2CBus && info->ddc2 && DDCReg == RADEON_LCD_GPIO_MASK) {
++    } else if (radeon_output->pI2CBus && info->ddc2 && ((DDCReg == RADEON_LCD_GPIO_MASK) || (DDCReg == RADEON_MDGPIO_EN_REG))) {
+          *MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, radeon_output->pI2CBus);
+     } else {
+ 	xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "DDC2/I2C is not properly initialized\n");
+@@ -2206,6 +2207,10 @@ static void RADEONI2CGetBits(I2CBusPtr b, int *Clock, int *data)
+         val = INREG(b->DriverPrivate.uval+4);
+         *Clock = (val & (1<<13)) != 0;
+         *data  = (val & (1<<12)) != 0;
++    } else if (b->DriverPrivate.uval == RADEON_MDGPIO_EN_REG) {
++        val = INREG(b->DriverPrivate.uval+4);
++        *Clock = (val & (1<<19)) != 0;
++        *data  = (val & (1<<18)) != 0;
+     } else {
+         val = INREG(b->DriverPrivate.uval);
+         *Clock = (val & RADEON_GPIO_Y_1) != 0;
+@@ -2225,6 +2230,11 @@ static void RADEONI2CPutBits(I2CBusPtr b, int Clock, int data)
+         val |= (Clock ? 0:(1<<13));
+         val |= (data ? 0:(1<<12));
+         OUTREG(b->DriverPrivate.uval, val);
++    } else if (b->DriverPrivate.uval == RADEON_MDGPIO_EN_REG) {
++        val = INREG(b->DriverPrivate.uval) & (CARD32)~((1<<18) | (1<<19));
++        val |= (Clock ? 0:(1<<19));
++        val |= (data ? 0:(1<<18));
++        OUTREG(b->DriverPrivate.uval, val);
+     } else {
+         val = INREG(b->DriverPrivate.uval) & (CARD32)~(RADEON_GPIO_EN_0 | RADEON_GPIO_EN_1);
+         val |= (Clock ? 0:RADEON_GPIO_EN_1);
+@@ -2547,6 +2557,7 @@ void RADEONInitConnector(xf86OutputPtr output)
+     case DDC_VGA  : DDCReg = RADEON_GPIO_VGA_DDC; break;
+     case DDC_CRT2 : DDCReg = RADEON_GPIO_CRT2_DDC; break;
+     case DDC_LCD  : DDCReg = RADEON_LCD_GPIO_MASK; break;
++    case DDC_GPIO : DDCReg = RADEON_MDGPIO_EN_REG; break;
+     default: break;
+     }
+ 
+diff --git a/src/radeon_probe.h b/src/radeon_probe.h
+index dbd50d7..66ece94 100644
+--- a/src/radeon_probe.h
++++ b/src/radeon_probe.h
+@@ -60,6 +60,7 @@ typedef enum
+     DDC_VGA,
+     DDC_CRT2,
+     DDC_LCD,
++    DDC_GPIO,
+ } RADEONDDCType;
+ 
+ typedef enum
================================================================