diff -u xserver-xorg-video-ati-6.12.2/debian/changelog xserver-xorg-video-ati-6.12.2/debian/changelog
--- xserver-xorg-video-ati-6.12.2/debian/changelog
+++ xserver-xorg-video-ati-6.12.2/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-ati (1:6.12.2-0ubuntu1~xup~2~mss) jaunty; urgency=low
+
+  * Add 111_fix_dvi_on_rs690.patch: Fix DCI output on some rs690
+    cards.  Filtered from upstream.
+    (LP: #298094)
+
+ -- Malte S. Stretz <mss@apache.org>  Tue, 05 May 2009 17:25:01 +0200
+
 xserver-xorg-video-ati (1:6.12.2-0ubuntu1~xup~1) jaunty; urgency=low
 
   * New upstream release.  Lots of bug fixes.  Adds r2xx/r3xx textured
diff -u xserver-xorg-video-ati-6.12.2/debian/patches/series xserver-xorg-video-ati-6.12.2/debian/patches/series
--- xserver-xorg-video-ati-6.12.2/debian/patches/series
+++ xserver-xorg-video-ati-6.12.2/debian/patches/series
@@ -2,0 +3 @@
+111_fix_dvi_on_rs690.patch
only in patch2:
unchanged:
--- xserver-xorg-video-ati-6.12.2.orig/debian/patches/111_fix_dvi_on_rs690.patch
+++ xserver-xorg-video-ati-6.12.2/debian/patches/111_fix_dvi_on_rs690.patch
@@ -0,0 +1,35 @@
+git diff xf86-video-ati-6.12.2 e01b8dc -- src/radeon_atombios.c | filterdiff --lines=2181-2332
+--- a/src/radeon_atombios.c
++++ b/src/radeon_atombios.c
+@@ -2240,8 +2240,11 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable (ScrnInfoPtr pScrn)
+ 	    info->BiosConnector[i].ddc_i2c.valid = FALSE;
+ 	else if ((info->ChipFamily == CHIP_FAMILY_RS690) ||
+ 		 (info->ChipFamily == CHIP_FAMILY_RS740)) {
+-	    /* IGP DFP ports use non-standard gpio entries */
+-	    if ((i == ATOM_DEVICE_DFP2_INDEX) || (i == ATOM_DEVICE_DFP3_INDEX))
++	    /* IGP DFP ports sometimes use non-standard gpio entries */
++	    if ((i == ATOM_DEVICE_DFP2_INDEX) && (ci.sucI2cId.sbfAccess.bfI2C_LineMux == 2))
++		info->BiosConnector[i].ddc_i2c =
++		    RADEONLookupGPIOLineForDDC(pScrn, ci.sucI2cId.sbfAccess.bfI2C_LineMux + 1);
++	    else if ((i == ATOM_DEVICE_DFP3_INDEX) && (ci.sucI2cId.sbfAccess.bfI2C_LineMux == 1))
+ 		info->BiosConnector[i].ddc_i2c =
+ 		    RADEONLookupGPIOLineForDDC(pScrn, ci.sucI2cId.sbfAccess.bfI2C_LineMux + 1);
+ 	    else
+@@ -2303,6 +2306,8 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable (ScrnInfoPtr pScrn)
+ 			    ((j == ATOM_DEVICE_CRT1_INDEX) ||
+ 			     (j == ATOM_DEVICE_CRT2_INDEX))) {
+ 			    info->BiosConnector[i].devices |= info->BiosConnector[j].devices;
++			    if (info->BiosConnector[i].ConnectorType == CONNECTOR_DVI_D)
++				info->BiosConnector[i].ConnectorType = CONNECTOR_DVI_I;
+ 			    info->BiosConnector[j].valid = FALSE;
+ 			} else if (((j == ATOM_DEVICE_DFP1_INDEX) ||
+ 				    (j == ATOM_DEVICE_DFP2_INDEX) ||
+@@ -2310,6 +2315,8 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable (ScrnInfoPtr pScrn)
+ 				   ((i == ATOM_DEVICE_CRT1_INDEX) ||
+ 				    (i == ATOM_DEVICE_CRT2_INDEX))) {
+ 			    info->BiosConnector[j].devices |= info->BiosConnector[i].devices;
++			    if (info->BiosConnector[j].ConnectorType == CONNECTOR_DVI_D)
++				info->BiosConnector[j].ConnectorType = CONNECTOR_DVI_I;
+ 			    info->BiosConnector[i].valid = FALSE;
+ 			} else {
+ 			    info->BiosConnector[i].shared_ddc = TRUE;