aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVille Syrjala <syrjala@sci.fi>2007-05-08 03:39:47 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 14:15:32 -0400
commit159dde93692ef549a0b2012c9f25feb4df638c9c (patch)
tree177bcb3ca3210664d3f594acaa560b8d9b8aa5bc
parentb4e124c138558a0cff51398ddff9a8e44ed0b529 (diff)
atyfb: halve XCLK with Mobility and 32bit memory
Laptops with Rage Mobility and 32bit memory interface seem to require halved XCLK to operate correctly. Signed-off-by: Antonino Daplas <adaplas@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/video/aty/atyfb_base.c3
-rw-r--r--include/video/mach64.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index b61ab3b4c922..ea67dd902d4e 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -2377,6 +2377,9 @@ static int __devinit aty_init(struct fb_info *info)
2377 /* for many chips, the mclk is 67 MHz for SDRAM, 63 MHz otherwise */ 2377 /* for many chips, the mclk is 67 MHz for SDRAM, 63 MHz otherwise */
2378 if (par->pll_limits.mclk == 67 && par->ram_type < SDRAM) 2378 if (par->pll_limits.mclk == 67 && par->ram_type < SDRAM)
2379 par->pll_limits.mclk = 63; 2379 par->pll_limits.mclk = 63;
2380 /* Mobility + 32bit memory interface need halved XCLK. */
2381 if (M64_HAS(MOBIL_BUS) && par->ram_type == SDRAM32)
2382 par->pll_limits.xclk = (par->pll_limits.xclk + 1) >> 1;
2380 } 2383 }
2381#endif 2384#endif
2382 2385
diff --git a/include/video/mach64.h b/include/video/mach64.h
index 09a7f4a7289f..a8332e528ec1 100644
--- a/include/video/mach64.h
+++ b/include/video/mach64.h
@@ -885,6 +885,7 @@
885#define SDRAM 4 885#define SDRAM 4
886#define SGRAM 5 886#define SGRAM 5
887#define WRAM 6 887#define WRAM 6
888#define SDRAM32 6
888 889
889#define DAC_INTERNAL 0x00 890#define DAC_INTERNAL 0x00
890#define DAC_IBMRGB514 0x01 891#define DAC_IBMRGB514 0x01