Fix "washed out colors" problem on IGP chips over analog link

Package-Manager: portage-2.1.3.19

5 files changed, 164 insertions, 15 deletions

diff --git a/x11-drivers/xf86-video-ati/ChangeLog b/x11-drivers/xf86-video-ati/ChangeLog
index 7fb834816932..4552ce434e7a 100644
--- a/x11-drivers/xf86-video-ati/ChangeLog
+++ b/x11-drivers/xf86-video-ati/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-video-ati
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.55 2007/11/13 04:53:45 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.56 2007/11/16 16:28:00 leio Exp $
+
+*xf86-video-ati-6.7.196-r1 (16 Nov 2007)
+
+  16 Nov 2007; Mart Raudsepp <leio@gentoo.org>
+  +files/6.7.196-fix_washed_color.patch, +xf86-video-ati-6.7.196-r1.ebuild:
+  Fix "washed out colors" problem on IGP chips over analog link
 
 *xf86-video-ati-6.7.196 (13 Nov 2007)
 
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index 5be7b696b650..4d799a71c8f6 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 6.7.196-fix_washed_color.patch 3816 RMD160 080c892a93861d1611995cf2f4def5dae89143f7 SHA1 d2067572ab1d829c9fd705c3d7f270df001a9282 SHA256 d8d9ac38c46658dee7f10fe4e8ea6f51e55c398395781ef03b2d8925d6a88047
+MD5 136d78e218727d28c41f9dc19f1431f7 files/6.7.196-fix_washed_color.patch 3816
+RMD160 080c892a93861d1611995cf2f4def5dae89143f7 files/6.7.196-fix_washed_color.patch 3816
+SHA256 d8d9ac38c46658dee7f10fe4e8ea6f51e55c398395781ef03b2d8925d6a88047 files/6.7.196-fix_washed_color.patch 3816
 AUX ati.xinf 2028 RMD160 0f57c7452bbf9d2d8d0a96f6f480b98e8a5c6d5f SHA1 51dc48aba9d3e2613d230837d369ebcab86b4c5c SHA256 79540e91ab1baf462ded22a5ef0f3cff0d95bef22db4ec13ea7101dbff29aa74
 MD5 2f03c4efec1e15ea956f71ea176f1653 files/ati.xinf 2028
 RMD160 0f57c7452bbf9d2d8d0a96f6f480b98e8a5c6d5f files/ati.xinf 2028
@@ -61,14 +62,18 @@ EBUILD xf86-video-ati-6.7.195.ebuild 913 RMD160 77cfa296f5923644b381a5507143570b
 MD5 19ae894abc88c520680b5883136fec58 xf86-video-ati-6.7.195.ebuild 913
 RMD160 77cfa296f5923644b381a5507143570b04812bae xf86-video-ati-6.7.195.ebuild 913
 SHA256 c0774ba582bd03474036aa5dcc2e406e9cfcd5d93f480f5463a66f2be87fb790 xf86-video-ati-6.7.195.ebuild 913
+EBUILD xf86-video-ati-6.7.196-r1.ebuild 951 RMD160 ddd75f20d2b6bcfc07df64d9eeb8f7ef017a5202 SHA1 7c3a15844c8e1987dfa420ce9c94356ae8589621 SHA256 cb33ec4de67b51f4f44d11820177fb486d2c4756ab376f71512f8f17f0cc7314
+MD5 8c888320d0a52af04b3bb46e628168ea xf86-video-ati-6.7.196-r1.ebuild 951
+RMD160 ddd75f20d2b6bcfc07df64d9eeb8f7ef017a5202 xf86-video-ati-6.7.196-r1.ebuild 951
+SHA256 cb33ec4de67b51f4f44d11820177fb486d2c4756ab376f71512f8f17f0cc7314 xf86-video-ati-6.7.196-r1.ebuild 951
 EBUILD xf86-video-ati-6.7.196.ebuild 913 RMD160 978ed5d270dd66267e893be339a2d9f4c229ab93 SHA1 599f46a6477bd908a4d995523a9c15de0cf4a26a SHA256 b20b0e506e19107e1788ecbf4b866eabb15132fe31b41edf51a664ab60bdeea2
 MD5 7f7ffe788d6b743258e8834746b609e6 xf86-video-ati-6.7.196.ebuild 913
 RMD160 978ed5d270dd66267e893be339a2d9f4c229ab93 xf86-video-ati-6.7.196.ebuild 913
 SHA256 b20b0e506e19107e1788ecbf4b866eabb15132fe31b41edf51a664ab60bdeea2 xf86-video-ati-6.7.196.ebuild 913
-MISC ChangeLog 9145 RMD160 d19e803a8ec9d74278944af3cede6571abe9404a SHA1 e15fa32b7aedbc542615bf201d5175ba9ce24ba0 SHA256 b9f83505db3abbf1503fab2ed0df3e79065e7dce19723e0320dbbf3d61395eef
-MD5 a634378b8692b5e23d04247eb9c7ef88 ChangeLog 9145
-RMD160 d19e803a8ec9d74278944af3cede6571abe9404a ChangeLog 9145
-SHA256 b9f83505db3abbf1503fab2ed0df3e79065e7dce19723e0320dbbf3d61395eef ChangeLog 9145
+MISC ChangeLog 9370 RMD160 cdbf48a2c27d94bb130b53d1afa4f5c8df605db9 SHA1 bafd0ed23471f96a1fba9a6026fdac3d619d3bd1 SHA256 0df9c04bdbbe67e4260b25196d3299d9e9520cf45629e172b3cc80205e0bfdaf
+MD5 906a0ac42721ff5aa8ec3dd831bb2ea1 ChangeLog 9370
+RMD160 cdbf48a2c27d94bb130b53d1afa4f5c8df605db9 ChangeLog 9370
+SHA256 0df9c04bdbbe67e4260b25196d3299d9e9520cf45629e172b3cc80205e0bfdaf ChangeLog 9370
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -103,10 +108,6 @@ SHA256 923a1d9402f7db7bd07386e8a4577e5726e051e896bfdb3bfc7a8ca41b6e4b7f files/di
 MD5 026ddf885acde913afee00f6cf5bac9e files/digest-xf86-video-ati-6.7.196 527
 RMD160 39e4eed1153c0d33d64a38e6c3bfa39aa90f4381 files/digest-xf86-video-ati-6.7.196 527
 SHA256 941d319d749d797fb02375d5c294b8701ba6a09779285fbbfb6cb35d56f7dff4 files/digest-xf86-video-ati-6.7.196 527
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHOS3fXVaO67S1rtsRAq7/AKDuK2DgnM5XfZg4xxV0cWKveg+Y/gCeMci5
-Lynmte57FcgVROq+9FruY3Y=
-=tGTp
------END PGP SIGNATURE-----
+MD5 026ddf885acde913afee00f6cf5bac9e files/digest-xf86-video-ati-6.7.196-r1 527
+RMD160 39e4eed1153c0d33d64a38e6c3bfa39aa90f4381 files/digest-xf86-video-ati-6.7.196-r1 527
+SHA256 941d319d749d797fb02375d5c294b8701ba6a09779285fbbfb6cb35d56f7dff4 files/digest-xf86-video-ati-6.7.196-r1 527
diff --git a/x11-drivers/xf86-video-ati/files/6.7.196-fix_washed_color.patch b/x11-drivers/xf86-video-ati/files/6.7.196-fix_washed_color.patch
new file mode 100644
index 000000000000..2bf48dc86211
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/files/6.7.196-fix_washed_color.patch
@@ -0,0 +1,99 @@
+From the fix for https://bugs.freedesktop.org/show_bug.cgi?id=12844 - "Display is washed out, too bright. No adjustment will correct for over bright display"
+Affecting mostly radeon IGP chips, such as the Radeon XPRESS
+Fixed by setting the TV DAC up correctly, etc
+
+diff --git a/src/radeon_output.c b/src/radeon_output.c
+index 599a89c..54c27cd 100644
+--- a/src/radeon_output.c
++++ b/src/radeon_output.c
+@@ -1039,11 +1039,12 @@ static void RADEONInitDACRegisters(xf86OutputPtr output, RADEONSavePtr save,
+     save->dac_macro_cntl = info->SavedReg.dac_macro_cntl;
+ }
+ 
+-/* XXX: fix me */
+ static void
+-RADEONInitTvDacCntl(ScrnInfoPtr pScrn, RADEONSavePtr save)
++RADEONInitTvDacCntl(xf86OutputPtr output, RADEONSavePtr save)
+ {
++    ScrnInfoPtr pScrn = output->scrn;
+     RADEONInfoPtr  info       = RADEONPTR(pScrn);
++    RADEONOutputPrivatePtr radeon_output = output->driver_private;
+ 
+     if (info->ChipFamily == CHIP_FAMILY_R420 ||
+ 	info->ChipFamily == CHIP_FAMILY_RV410) {
+@@ -1064,10 +1065,11 @@ RADEONInitTvDacCntl(ScrnInfoPtr pScrn, RADEONSavePtr save)
+ 			       RADEON_TV_DAC_GDACPD |
+ 			       RADEON_TV_DAC_GDACPD);
+     }
+-    /* FIXME: doesn't make sense, this just replaces the previous value... */
++
+     save->tv_dac_cntl |= (RADEON_TV_DAC_NBLANK |
+-			 RADEON_TV_DAC_NHOLD |
+-			  RADEON_TV_DAC_STD_PS2);
++			  RADEON_TV_DAC_NHOLD |
++			  RADEON_TV_DAC_STD_PS2 |
++			  radeon_output->tv_dac_adj);
+ 
+ }
+ 
+@@ -1078,7 +1080,7 @@ static void RADEONInitDAC2Registers(xf86OutputPtr output, RADEONSavePtr save,
+     RADEONInfoPtr  info       = RADEONPTR(pScrn);
+ 
+     /*0x0028023;*/
+-    RADEONInitTvDacCntl(pScrn, save);
++    RADEONInitTvDacCntl(output, save);
+ 
+     if (IS_R300_VARIANT)
+ 	save->gpiopad_a = info->SavedReg.gpiopad_a | 1;
+@@ -1671,9 +1673,13 @@ radeon_detect(xf86OutputPtr output)
+ 	   * so we can get something on the screen
+ 	   */
+ 	  if (((radeon_output->type == OUTPUT_VGA || radeon_output->type == OUTPUT_DVI) &&
+-	       radeon_output->DACType == DAC_TVDAC) ||
+-	      (info->IsIGP && radeon_output->type == OUTPUT_DVI))
++	       radeon_output->DACType == DAC_TVDAC)) {
++	      radeon_output->MonType = MT_CRT;
+ 	      return XF86OutputStatusUnknown;
++	  } else if  (info->IsIGP && radeon_output->type == OUTPUT_DVI) {
++	      radeon_output->MonType = MT_DFP; /* MT_LCD ??? */
++	      return XF86OutputStatusUnknown;
++	  }
+       }
+ 
+       if (connected)
+@@ -2623,6 +2629,7 @@ void RADEONInitConnector(xf86OutputPtr output)
+     if (radeon_output->type == OUTPUT_STV ||
+ 	radeon_output->type == OUTPUT_CTV) {
+ 	RADEONGetTVInfo(output);
++	RADEONGetTVDacAdjInfo(output);
+     }
+ 
+     if (radeon_output->DACType == DAC_TVDAC) {
+diff --git a/src/radeon_tv.c b/src/radeon_tv.c
+index 3a26a0a..2a8873c 100644
+--- a/src/radeon_tv.c
++++ b/src/radeon_tv.c
+@@ -434,7 +434,7 @@ void RADEONInitTVRegisters(xf86OutputPtr output, RADEONSavePtr save,
+ 
+     save->tv_vscaler_cntl2 = ((save->tv_vscaler_cntl2 & 0x00fffff0)
+ 			      | (0x10 << 24)
+-			      | RADEON_DITHER_MODE 
++			      | RADEON_DITHER_MODE
+ 			      | RADEON_Y_OUTPUT_DITHER_EN
+ 			      | RADEON_UV_OUTPUT_DITHER_EN
+ 			      | RADEON_UV_TO_BUF_DITHER_EN);
+@@ -444,10 +444,12 @@ void RADEONInitTVRegisters(xf86OutputPtr output, RADEONSavePtr save,
+     tmp = (tmp << RADEON_UV_OUTPUT_POST_SCALE_SHIFT) | 0x000b0000;
+     save->tv_timing_cntl = tmp;
+ 
+-    save->tv_dac_cntl = RADEON_TV_DAC_NBLANK | RADEON_TV_DAC_NHOLD | (8 << 16) | (6 << 20);
++    save->tv_dac_cntl = (RADEON_TV_DAC_NBLANK |
++			 RADEON_TV_DAC_NHOLD |
++			 radeon_output->tv_dac_adj /*(8 << 16) | (6 << 20)*/);
+ 
+     if (radeon_output->tvStd == TV_STD_NTSC ||
+-        radeon_output->tvStd == TV_STD_NTSC_J)
++	radeon_output->tvStd == TV_STD_NTSC_J)
+ 	save->tv_dac_cntl |= RADEON_TV_DAC_STD_NTSC;
+     else
+ 	save->tv_dac_cntl |= RADEON_TV_DAC_STD_PAL;
diff --git a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.7.196-r1 b/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.7.196-r1
new file mode 100644
index 000000000000..97f34ffcf0c4
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.7.196-r1
@@ -0,0 +1,6 @@
+MD5 56566e8c3fb4bb99791d1788d0a9a1a8 x11-driver-patches-4.tar.bz2 346
+RMD160 fcbd405de080d07612d46f455b927035fd8123a8 x11-driver-patches-4.tar.bz2 346
+SHA256 07069bbd072f2def50e83801a8f2a41a4c96495104f15cd6f56f7df7f89769bf x11-driver-patches-4.tar.bz2 346
+MD5 06db625391c75c8be86c4dd5a5d713e6 xf86-video-ati-6.7.196.tar.bz2 787475
+RMD160 fae77f0f9e4acaed755617ce53214e73f53c10cf xf86-video-ati-6.7.196.tar.bz2 787475
+SHA256 8923a08232255ceacf770ef767d86bbfb195dffa9559baa1b1de90f9c947a6d9 xf86-video-ati-6.7.196.tar.bz2 787475
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.7.196-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.7.196-r1.ebuild
new file mode 100644
index 000000000000..8f5d54b6b2ba
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.7.196-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.7.196-r1.ebuild,v 1.1 2007/11/16 16:28:00 leio Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+XDPVER=4
+
+inherit x-modular
+
+DESCRIPTION="ATI video driver"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.2"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/videoproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xf86miscproto
+	x11-proto/xproto
+	dri? ( x11-proto/glproto
+			x11-proto/xf86driproto
+			>=x11-libs/libdrm-2 )"
+
+PATCHES="${PV}-fix_washed_color.patch"
+
+CONFIGURE_OPTIONS="$(use_enable dri)"
+
+pkg_setup() {
+	if use dri && ! built_with_use x11-base/xorg-server dri; then
+		die "Build x11-base/xorg-server with USE=dri."
+	fi
+}