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

[Moritz Muehlenhoff]

Author: jmm
Date: Sat Jul 18 23:20:16 2009
New Revision: 13972

Log:
fbdev/atyfb: Fix display corruption on some PowerMacs & PowerBooks

Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/all/atyfb-fix-display-corruption-on-ppc.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/18

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Sat Jul 18 16:03:08 2009	(r13971)
+++ dists/lenny/linux-2.6/debian/changelog	Sat Jul 18 23:20:16 2009	(r13972)
@@ -15,6 +15,10 @@
   [ dann frazier ]
   * e1000e: add support for 82574L controllers (closes: #534519)
 
+  [ Moritz Muehlenhoff ]
+  * fbdev/atyfb: Fix display corruption on some PowerMacs & PowerBooks
+    (Closes: #420582)
+
  -- maximilian attems <maks at debian.org>  Wed, 10 Jun 2009 15:34:04 +0200
 
 linux-2.6 (2.6.26-17) stable; urgency=high

Added: dists/lenny/linux-2.6/debian/patches/bugfix/all/atyfb-fix-display-corruption-on-ppc.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/atyfb-fix-display-corruption-on-ppc.patch	Sat Jul 18 23:20:16 2009	(r13972)
@@ -0,0 +1,54 @@
+From: Risto Suominen <Risto.Suominen at gmail.com>
+Date: Tue, 13 Jan 2009 20:09:30 +0000 (+0000)
+Subject: fbdev/atyfb: Fix DSP config on some PowerMacs & PowerBooks
+X-Git-Tag: v2.6.29-rc4~67^2
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=7fbb7cadd062baf299fd8b26a80ea99da0c3fe01;hp=59b608c2c33feacc8be281ec3ba9ca2a3a5cb9a7
+
+fbdev/atyfb: Fix DSP config on some PowerMacs & PowerBooks
+
+Since the complete re-write in 2.6.10, some PowerMacs (At least PowerMac 5500
+and PowerMac G3 Beige rev A) with ATI Mach64 chip have suffered from unstable
+columns in their framebuffer image. This seems to depend on a value (4) read
+from PLL_EXT_CNTL register, which leads to incorrect DSP config parameters to
+be written to the chip. This patch uses a value calculated by aty_init_pll_ct
+instead, as a starting point.
+
+There are questions as to whether this should be extended to other platforms
+or maybe made dependent on specific chip types, but in the meantime, this has
+been tested on various powermacs and works for them so let's commit it.
+
+Signed-off-by: Risto Suominen <Risto.Suominen at gmail.com>
+Tested-by: Michael Pettersson <mike at it.uu.se>
+Cc: <stable at kernel.org>
+Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
+---
+
+diff --git a/drivers/video/aty/mach64_ct.c b/drivers/video/aty/mach64_ct.c
+index c50c7cf..2745b85 100644
+--- a/drivers/video/aty/mach64_ct.c
++++ b/drivers/video/aty/mach64_ct.c
+@@ -8,6 +8,9 @@
+ #include <asm/io.h>
+ #include <video/mach64.h>
+ #include "atyfb.h"
++#ifdef CONFIG_PPC
++#include <asm/machdep.h>
++#endif
+ 
+ #undef DEBUG
+ 
+@@ -536,6 +539,14 @@ static int __devinit aty_init_pll_ct(const struct fb_info *info,
+ 	pll->ct.xclk_post_div_real = postdividers[xpost_div];
+ 	pll->ct.mclk_fb_div = q * pll->ct.xclk_post_div_real / 8;
+ 
++#ifdef CONFIG_PPC
++	if (machine_is(powermac)) {
++		/* Override PLL_EXT_CNTL & 0x07. */
++		pll->ct.xclk_post_div = xpost_div;
++		pll->ct.xclk_ref_div = 1;
++	}
++#endif
++
+ #ifdef DEBUG
+ 	pllmclk = (1000000 * pll->ct.mclk_fb_mult * pll->ct.mclk_fb_div) /
+ 			(par->ref_clk_per * pll->ct.pll_ref_div);

Modified: dists/lenny/linux-2.6/debian/patches/series/18
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/18	Sat Jul 18 16:03:08 2009	(r13971)
+++ dists/lenny/linux-2.6/debian/patches/series/18	Sat Jul 18 23:20:16 2009	(r13972)
@@ -3,3 +3,4 @@
 + bugfix/mips/rtc-use-platform.patch
 + features/all/e1000e-test-for-unusable-MSI-support.patch
 + features/all/e1000e-add-support-for-82574l.patch
++ bugfix/all/atyfb-fix-display-corruption-on-ppc.patch