mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-27 22:51:31 +00:00
Code Issues Releases Wiki Activity

cirrusfb: fix Laguna chipset memory detection and clock setting

Browse source 
Fix memory detection and clock setting for Cirrus Laguna chipsets
(GD5464/GD5465).  The changes are done after the Xorg code.

The driver still does not display anything on the GD5465 but it switches
resolutions correctly at least.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Krzysztof Helt 2009-03-31 15:25:04 -07:00 committed by Linus Torvalds
parent 75ed3a17a5
commit 55a4ea6ab0
1 changed files with 38 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
drivers/video/cirrusfb.c
View file

@ -867,19 +867,24 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
} }
} }
if (nom) { if (nom) {
vga_wseq(regbase, CL_SEQRB, nom);
tmp = den << 1; tmp = den << 1;
if (div != 0) if (div != 0)
tmp |= 1; tmp |= 1;
/* 6 bit denom; ONLY 5434!!! (bugged me 10 days) */ /* 6 bit denom; ONLY 5434!!! (bugged me 10 days) */
if ((cinfo->btype == BT_SD64) || if ((cinfo->btype == BT_SD64) ||
(cinfo->btype == BT_ALPINE) || (cinfo->btype == BT_ALPINE) ||
(cinfo->btype == BT_GD5480)) (cinfo->btype == BT_GD5480))
tmp |= 0x80; tmp |= 0x80;
dev_dbg(info->device, "CL_SEQR1B: %ld\n", (long) tmp); dev_dbg(info->device, "CL_SEQR1B: %d\n", (int) tmp);
vga_wseq(regbase, CL_SEQR1B, tmp); /* Laguna chipset has reversed clock registers */
if (cinfo->btype == BT_LAGUNA) {
vga_wseq(regbase, CL_SEQRE, tmp);
vga_wseq(regbase, CL_SEQR1E, nom);
} else {
vga_wseq(regbase, CL_SEQRB, nom);
vga_wseq(regbase, CL_SEQR1B, tmp);
}
} }
if (yres >= 1024) if (yres >= 1024)
@ -1917,31 +1922,37 @@ static unsigned int __devinit cirrusfb_get_memsize(struct fb_info *info,
u8 __iomem *regbase) u8 __iomem *regbase)
{ {
unsigned long mem; unsigned long mem;
unsigned char SRF; struct cirrusfb_info *cinfo = info->par;
SRF = vga_rseq(regbase, CL_SEQRF); if (cinfo->btype == BT_LAGUNA) {
switch ((SRF & 0x18)) { unsigned char SR14 = vga_rseq(regbase, CL_SEQR14);
case 0x08:
mem = 512 * 1024; mem = ((SR14 & 7) + 1) << 20;
break; } else {
case 0x10: unsigned char SRF = vga_rseq(regbase, CL_SEQRF);
mem = 1024 * 1024; switch ((SRF & 0x18)) {
break; case 0x08:
/* 64-bit DRAM data bus width; assume 2MB. Also indicates 2MB memory mem = 512 * 1024;
* on the 5430. break;
*/ case 0x10:
case 0x18: mem = 1024 * 1024;
mem = 2048 * 1024; break;
break; /* 64-bit DRAM data bus width; assume 2MB.
default: * Also indicates 2MB memory on the 5430.
dev_warn(info->device, "CLgenfb: Unknown memory size!\n"); */
mem = 1024 * 1024; case 0x18:
mem = 2048 * 1024;
break;
default:
dev_warn(info->device, "Unknown memory size!\n");
mem = 1024 * 1024;
}
/* If DRAM bank switching is enabled, there must be
* twice as much memory installed. (4MB on the 5434)
*/
if (SRF & 0x80)
mem *= 2;
} }
if (SRF & 0x80)
/* If DRAM bank switching is enabled, there must be twice as much
* memory installed. (4MB on the 5434)
*/
mem *= 2;
/* TODO: Handling of GD5446/5480 (see XF86 sources ...) */ /* TODO: Handling of GD5446/5480 (see XF86 sources ...) */
return mem; return mem;