[kernel] r5138 - in dists/trunk/linux-2.6/debian: . patches-debian patches-debian/series

[Jurij Smakov]

Author: jurij-guest
Date: Fri Dec 30 01:03:54 2005
New Revision: 5138

Added:
   dists/trunk/linux-2.6/debian/patches-debian/sparc64-atyfb-xl-gr-final.patch
Removed:
   dists/trunk/linux-2.6/debian/patches-debian/sparc64-atyfb-xl-gr.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc7-0experimental.1
Log:
Update the patch for the image corruption in
console and X on Blade 100/150 with atyfb framebuffer.


Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Dec 30 01:03:54 2005
@@ -44,7 +44,13 @@
   * [powerpc] Fixed apus patch for 2.6.15-rc7 (and beyond hopefully).
   * [powerpc] Fixed config options, but i guess jonas broke it again with his
     cleanup, oh well :)
-
+  
+  [ 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.
+  
  -- Sven Luther <luther at debian.org>  Thu, 29 Dec 2005 09:48:36 +0000
 
 linux-2.6 (2.6.14+2.6.15-rc5-0experimental.1) experimental; urgency=low

Modified: dists/trunk/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc7-0experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc7-0experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc7-0experimental.1	Fri Dec 30 01:03:54 2005
@@ -19,6 +19,6 @@
 + m68k-mvme147.patch
 + m68k-mvme16x.patch
 + m68k-spinlock.patch
-+ sparc64-atyfb-xl-gr.patch
++ sparc64-atyfb-xl-gr-final.patch
 + powerpc-arch-default-powerpc.patch
 + drivers-scsi-megaraid_splitup.patch

Added: dists/trunk/linux-2.6/debian/patches-debian/sparc64-atyfb-xl-gr-final.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches-debian/sparc64-atyfb-xl-gr-final.patch	Fri Dec 30 01:03:54 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 },
+