Add ATY video fix from SunBlade 100/150, fwd from DaveM

diff --git a/queue-2.6.14/fix-ATY-video-on-sunblade.patch b/queue-2.6.14/fix-ATY-video-on-sunblade.patch
new file mode 100644 (file)
index 0000000..1efa5a2
--- /dev/null
+++ b/queue-2.6.14/fix-ATY-video-on-sunblade.patch
@@ -0,0 +1,55 @@
+From stable-bounces@linux.kernel.org  Thu Jan  5 13:24:02 2006
+Date: Thu, 05 Jan 2006 13:19:46 -0800 (PST)
+Message-Id: <20060105.131946.103228568.davem@davemloft.net>
+To: stable@kernel.org
+From: "David S. Miller" <davem@davemloft.net>
+Subject: [ATYFB]: Fix onboard video on SPARC Blade 100 for 2.6.{13,14,15}
+
+From: Luis F. Ortiz <lfo@Polyad.Org>
+
+       I have recently been switching from using 2.4.32 on my trusty
+old Sparc Blade 100 to using 2.6.15 .  Some of the problems I ran into
+were distorted video when the console was active (missing first
+character, skipped dots) and when running X windows (colored snow,
+stripes, missing pixels).  A quick examination of the 2.6 versus 2.4
+source for the ATY driver revealed alot of changes.
+
+         A closer look at the code/data for the 64GR/XL chip revealed
+two minor "typos" that the rewriter(s) of the code made.  The first is
+a incorrect clock value (230 .vs. 235) and the second is a missing
+flag (M64F_SDRAM_MAGIC_PLL).  Making both these changes seems to have
+fixed my problem.  I tend to think the 235 value is the correct one,
+as there is a 29.4 Mhz clock crystal close to the video chip and 235.2
+(29.4*8) is too close to 235 to make it a coincidence.
+
+       The flag for M64F_SDRAM_MAGIC_PLL was dropped during the
+changes made by adaplas in file revision 1.72 on the old bitkeeper
+repository.
+
+       The change relating to the clock rate has been there forever,
+at least in the 2.6 tree.  I'm not sure where to look for the old 2.5
+tree or if anyone cares when it happened.
+
+On SPARC Blades 100's, which use the ATY MACH64GR video chipset, the
+clock crystal frequency is 235.2 Mhz, not 230 Mhz.  The chipset also
+requires the use of M64F_SDRAM_MAGIC_PLL in order to setup the PLL
+properly for the DRAM.
+
+Signed-off-by: Luis F. Ortiz <lfo@Polyad.Org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+ drivers/video/aty/atyfb_base.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- linux-2.6.14.5.orig/drivers/video/aty/atyfb_base.c
++++ linux-2.6.14.5/drivers/video/aty/atyfb_base.c
+@@ -404,7 +404,7 @@ static struct {
+       { 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 },
+ 

diff --git a/queue-2.6.14/series b/queue-2.6.14/series
index 37f87815763f45df5b14e25471210851d188b8db..b18fc638113c7048046414087a4e596c753ee0eb 100644 (file)
--- a/queue-2.6.14/series
+++ b/queue-2.6.14/series
@@ -3,3 +3,4 @@ ieee80211_crypt_tkip-depends-on-net_radio.patch
 insanity-avoidance-in-proc.patch
 sysctl-don-t-overflow-the-user-supplied-buffer-with-0.patch
 ufs-inode-i_sem-is-not-released-in-error-path.patch
+fix-ATY-video-on-sunblade.patch

diff --git a/queue/fix-ATY-video-on-sunblade.patch b/queue/fix-ATY-video-on-sunblade.patch
new file mode 100644 (file)
index 0000000..9df2044
--- /dev/null
+++ b/queue/fix-ATY-video-on-sunblade.patch
@@ -0,0 +1,55 @@
+From stable-bounces@linux.kernel.org  Thu Jan  5 13:24:02 2006
+Date: Thu, 05 Jan 2006 13:19:46 -0800 (PST)
+Message-Id: <20060105.131946.103228568.davem@davemloft.net>
+To: stable@kernel.org
+From: "David S. Miller" <davem@davemloft.net>
+Subject: [ATYFB]: Fix onboard video on SPARC Blade 100 for 2.6.{13,14,15}
+
+From: Luis F. Ortiz <lfo@Polyad.Org>
+
+       I have recently been switching from using 2.4.32 on my trusty
+old Sparc Blade 100 to using 2.6.15 .  Some of the problems I ran into
+were distorted video when the console was active (missing first
+character, skipped dots) and when running X windows (colored snow,
+stripes, missing pixels).  A quick examination of the 2.6 versus 2.4
+source for the ATY driver revealed alot of changes.
+
+         A closer look at the code/data for the 64GR/XL chip revealed
+two minor "typos" that the rewriter(s) of the code made.  The first is
+a incorrect clock value (230 .vs. 235) and the second is a missing
+flag (M64F_SDRAM_MAGIC_PLL).  Making both these changes seems to have
+fixed my problem.  I tend to think the 235 value is the correct one,
+as there is a 29.4 Mhz clock crystal close to the video chip and 235.2
+(29.4*8) is too close to 235 to make it a coincidence.
+
+       The flag for M64F_SDRAM_MAGIC_PLL was dropped during the
+changes made by adaplas in file revision 1.72 on the old bitkeeper
+repository.
+
+       The change relating to the clock rate has been there forever,
+at least in the 2.6 tree.  I'm not sure where to look for the old 2.5
+tree or if anyone cares when it happened.
+
+On SPARC Blades 100's, which use the ATY MACH64GR video chipset, the
+clock crystal frequency is 235.2 Mhz, not 230 Mhz.  The chipset also
+requires the use of M64F_SDRAM_MAGIC_PLL in order to setup the PLL
+properly for the DRAM.
+
+Signed-off-by: Luis F. Ortiz <lfo@Polyad.Org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+ drivers/video/aty/atyfb_base.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- linux-2.6.15.y.orig/drivers/video/aty/atyfb_base.c
++++ linux-2.6.15.y/drivers/video/aty/atyfb_base.c
+@@ -403,7 +403,7 @@ static struct {
+       { 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 },
+ 

diff --git a/queue/series b/queue/series
index 93b59f1dafe8cb226356dfd3a812aefef831189b..ce841023c5fc095eb1340a02f1a05cb33c40c6f0 100644 (file)
--- a/queue/series
+++ b/queue/series
@@ -1,3 +1,4 @@
 bridge-fix-faulty-check-in-br_stp_recalculate_bridge_id.patch
 ufs-inode-i_sem-is-not-released-in-error-path.patch
 skge-handle-out-of-memory-on-ring-changes.patch
+fix-ATY-video-on-sunblade.patch