[kernel] r5816 - in dists/exp/linux-2.6/debian: . patches patches/series

[Jurij Smakov]

Author: jurij-guest
Date: Sat Feb 11 05:28:45 2006
New Revision: 5816

Added:
   dists/exp/linux-2.6/debian/patches/sparc64-atyfb-xl-gr.patch
Removed:
   dists/exp/linux-2.6/debian/patches/sparc64-atyfb-xl-gr-final.patch
Modified:
   dists/exp/linux-2.6/debian/changelog
   dists/exp/linux-2.6/debian/patches/series/0experimental.1
Log:
Add sparc64-atyfb-xl-gr.patch, since it was not
completely merged upstream, so the bug is still there.


Modified: dists/exp/linux-2.6/debian/changelog
==============================================================================
--- dists/exp/linux-2.6/debian/changelog	(original)
+++ dists/exp/linux-2.6/debian/changelog	Sat Feb 11 05:28:45 2006
@@ -13,6 +13,10 @@
     appends it to the version string, breaking the build.
     Closes: #349472
   * [sparc32] Re-enable the building of sparc32 images.
+  * [sparc64] Re-add (partial) sparc64-atyf-xl-gr.patch, since it
+    was only partially applied upstream, so the problem (garbled
+    screen output on SunBlade 100) is still present. Thanks to
+    Luis Ortiz for pointing it out.
     
  -- Frederik Schüler <fs at debian.org>  Fri,  3 Feb 2006 14:36:04 +0100
 

Modified: dists/exp/linux-2.6/debian/patches/series/0experimental.1
==============================================================================
--- dists/exp/linux-2.6/debian/patches/series/0experimental.1	(original)
+++ dists/exp/linux-2.6/debian/patches/series/0experimental.1	Sat Feb 11 05:28:45 2006
@@ -16,3 +16,4 @@
 #FIXME + powerpc-serial.patch 
 #FIXME + powerpc-apus.patch
 + sparc64-hme-lockup.patch
++ sparc64-atyfb-xl-gr.patch

Added: dists/exp/linux-2.6/debian/patches/sparc64-atyfb-xl-gr.patch
==============================================================================
--- (empty file)
+++ dists/exp/linux-2.6/debian/patches/sparc64-atyfb-xl-gr.patch	Sat Feb 11 05:28:45 2006
@@ -0,0 +1,11 @@
+--- a/drivers/video/aty/atyfb_base.c	2006-02-03 05:23:59.000000000 -0800
++++ b/drivers/video/aty/atyfb_base.c	2006-02-09 21:25:53.163445232 -0800
+@@ -415,7 +415,7 @@
+ 	{ PCI_CHIP_MACH64GN, "3D RAGE XC (Mach64 GN, AGP 2x)", 230, 83, 63, 135, ATI_CHIP_264XL },
+ 	{ PCI_CHIP_MACH64GO, "3D RAGE XL (Mach64 GO, PCI-66)", 230, 83, 63, 135, ATI_CHIP_264XL },
+ 	{ PCI_CHIP_MACH64GL, "3D RAGE XC (Mach64 GL, PCI-66)", 230, 83, 63, 135, ATI_CHIP_264XL },
+-	{ PCI_CHIP_MACH64GR, "3D RAGE XL (Mach64 GR, PCI-33)", 230, 83, 63, 135, ATI_CHIP_264XL | M64F_SDRAM_MAGIC_PLL },
++	{ PCI_CHIP_MACH64GR, "3D RAGE XL (Mach64 GR, PCI-33)", 235, 83, 63, 135, ATI_CHIP_264XL | M64F_SDRAM_MAGIC_PLL },
+ 	{ PCI_CHIP_MACH64GS, "3D RAGE XC (Mach64 GS, PCI-33)", 230, 83, 63, 135, ATI_CHIP_264XL },
+ 
+ 	{ PCI_CHIP_MACH64LM, "3D RAGE Mobility P/M (Mach64 LM, AGP 2x)", 230, 83, 125, 135, ATI_CHIP_MOBILITY },