[kernel] r15108 - in dists/lenny/linux-2.6/debian: . patches/bugfix/all patches/series

[Maximilian Attems]

Author: maks
Date: Thu Feb  4 00:46:45 2010
New Revision: 15108

Log:
fix long lasting matroxfb regression

the fix is a oneliner that got pushed into 2.6.33-rc1 and 2.6.32.2
thus squeeze is covered, have it also for lenny as late comer.

Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/all/matroxfb-fix-problems-with-display-stability.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/22

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Wed Feb  3 06:55:54 2010	(r15107)
+++ dists/lenny/linux-2.6/debian/changelog	Thu Feb  4 00:46:45 2010	(r15108)
@@ -5,6 +5,7 @@
   * [openvz] 1a6d795 Fix cfq related oops. (closes: #562892)
   * [openvz] ddbec37 inotify: unblock umounting. (closes: #513537)
   * ALSA: cs4232: fix crash during chip PNP detection. (closes: #529697)
+  * matroxfb: fix problems with display stability. (closes: #479652)
   
   [ Ben Hutchings ]
   * via-velocity: Give RX descriptors to the NIC later on open or MTU change

Added: dists/lenny/linux-2.6/debian/patches/bugfix/all/matroxfb-fix-problems-with-display-stability.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/matroxfb-fix-problems-with-display-stability.patch	Thu Feb  4 00:46:45 2010	(r15108)
@@ -0,0 +1,45 @@
+From 8c651311a3a08c1e4815de6933e00a760e498dae Mon Sep 17 00:00:00 2001
+From: Alan Cox <alan at linux.intel.com>
+Date: Tue, 15 Dec 2009 16:46:40 -0800
+Subject: matroxfb: fix problems with display stability
+
+From: Alan Cox <alan at linux.intel.com>
+
+commit 8c651311a3a08c1e4815de6933e00a760e498dae upstream.
+
+Regression caused in 2.6.23 and then despite repeated requests never fixed
+or dealt with (Petr promised to sort it in 2008 but seems to have
+forgotten).
+
+Enough is enough - remove the problem line that was added.  If it upsets
+someone they've had two years to deal with it and at the very least it'll
+rattle their cage and wake them up.
+
+Addresses http://bugzilla.kernel.org/show_bug.cgi?id=9709
+
+Signed-off-by: Alan Cox <alan at linux.intel.com>
+Reported-by: Damon <account at bugzilla.kernel.org.juxtaposition.net>
+Tested-by: Ruud van Melick <rvm1974 at raketnet.nl>
+Cc: Petr Vandrovec <VANDROVE at vc.cvut.cz>
+Cc: Pekka Enberg <penberg at cs.helsinki.fi>
+Cc: Paul A. Clarke <pc at us.ibm.com>
+Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ drivers/video/matrox/g450_pll.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/video/matrox/g450_pll.c
++++ b/drivers/video/matrox/g450_pll.c
+@@ -368,7 +368,8 @@ static int __g450_setclk(struct matrox_f
+ 					M1064_XDVICLKCTRL_C1DVICLKEN |
+ 					M1064_XDVICLKCTRL_DVILOOPCTL |
+ 					M1064_XDVICLKCTRL_P1LOOPBWDTCTL;
+-				matroxfb_DAC_out(minfo, M1064_XDVICLKCTRL, tmp);
++                                /* Setting this breaks PC systems so don't do it */
++				/* matroxfb_DAC_out(minfo, M1064_XDVICLKCTRL, tmp); */
+ 				matroxfb_DAC_out(minfo, M1064_XPWRCTRL,
+ 						 xpwrctrl);
+ 

Modified: dists/lenny/linux-2.6/debian/patches/series/22
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/22	Wed Feb  3 06:55:54 2010	(r15107)
+++ dists/lenny/linux-2.6/debian/patches/series/22	Thu Feb  4 00:46:45 2010	(r15108)
@@ -13,3 +13,4 @@
 + bugfix/all/fix-braindamage-in-audit_tree.c-untag_chunk.patch
 + bugfix/all/fix-more-leaks-in-audit_tree.c-tag_chunk.patch
 + bugfix/all/ALSA-cs4232-fix-crash-during-chip-PNP-detection.patch
++ bugfix/all/matroxfb-fix-problems-with-display-stability.patch