[kernel] r5140 - in dists/sid/linux-2.6/debian: . patches-debian patches-debian/series

[Jurij Smakov]

Author: jurij-guest
Date: Fri Dec 30 01:20:53 2005
New Revision: 5140

Added:
   dists/sid/linux-2.6/debian/patches-debian/sparc64-atyfb-xl-gr-final.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches-debian/series/2.6.14-7
Log:
Update the patch for the image corruption in
console and X on Blade 100/150 with atyfb framebuffer.


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Fri Dec 30 01:20:53 2005
@@ -20,6 +20,14 @@
     - Fix route lifetime.
     - apci: fix NULL deref in video/lcd/brightness 
 
+  [ Jurij Smakov ]
+    * [sparc] Correct the patch for the atyfb framebuffer driver
+      (sparc64-atyfb-xl-gr.patch) to finally fix the console and X
+      image defects on Blade 100/150. The new patch is named
+      sparc64-atyfb-xl-gr-final.patch to avoid the confusion.
+      Thanks to Luis F. Ortiz for fixing the patch and Luigi Gangitano
+      for testing it out. (Closes: #317756)
+
  -- maximilian attems <maks at sternwelten.at>  Tue, 27 Dec 2005 17:39:16 +0100
 
 linux-2.6 (2.6.14-6) unstable; urgency=low

Modified: dists/sid/linux-2.6/debian/patches-debian/series/2.6.14-7
==============================================================================
--- dists/sid/linux-2.6/debian/patches-debian/series/2.6.14-7	(original)
+++ dists/sid/linux-2.6/debian/patches-debian/series/2.6.14-7	Fri Dec 30 01:20:53 2005
@@ -1 +1,3 @@
 + 2.6.14.5.patch
+- sparc64-atyfb-xl-gr.patch
++ sparc64-atyfb-xl-gr-final.patch

Added: dists/sid/linux-2.6/debian/patches-debian/sparc64-atyfb-xl-gr-final.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches-debian/sparc64-atyfb-xl-gr-final.patch	Fri Dec 30 01:20:53 2005
@@ -0,0 +1,12 @@
+diff -aur a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
+--- a/drivers/video/aty/atyfb_base.c	2005-10-27 17:02:08.000000000 -0700
++++ b/drivers/video/aty/atyfb_base.c	2005-11-09 19:56:18.000000000 -0800
+@@ -404,7 +404,7 @@
+ 	{ PCI_CHIP_MACH64GM, "3D RAGE XL (Mach64 GM, AGP)", 230, 83, 63, ATI_CHIP_264XL },
+ 	{ PCI_CHIP_MACH64GN, "3D RAGE XL (Mach64 GN, AGP)", 230, 83, 63, ATI_CHIP_264XL },
+ 	{ PCI_CHIP_MACH64GO, "3D RAGE XL (Mach64 GO, PCI-66/BGA)", 230, 83, 63, ATI_CHIP_264XL },
+-	{ PCI_CHIP_MACH64GR, "3D RAGE XL (Mach64 GR, PCI-33MHz)", 230, 83, 63, ATI_CHIP_264XL },
++	{ PCI_CHIP_MACH64GR, "3D RAGE XL (Mach64 GR, PCI-33MHz)", 235, 83, 63, ATI_CHIP_264XL | M64F_SDRAM_MAGIC_PLL },
+ 	{ PCI_CHIP_MACH64GL, "3D RAGE XL (Mach64 GL, PCI)", 230, 83, 63, ATI_CHIP_264XL },
+ 	{ PCI_CHIP_MACH64GS, "3D RAGE XL (Mach64 GS, PCI)", 230, 83, 63, ATI_CHIP_264XL },
+