Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55a4ea6a authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Linus Torvalds
Browse files

cirrusfb: fix Laguna chipset memory detection and clock setting 



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: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 75ed3a17

drivers/video/cirrusfb.c

+38 −27
Original line number Diff line number Diff line
@@ -867,20 +867,25 @@ static int cirrusfb_set_par_foo(struct fb_info *info) 
		}

	}

	if (nom) {

		vga_wseq(regbase, CL_SEQRB, nom);

		tmp = den << 1;

		if (div != 0)

			tmp |= 1;



		/* 6 bit denom; ONLY 5434!!! (bugged me 10 days) */

		if ((cinfo->btype == BT_SD64) ||

		    (cinfo->btype == BT_ALPINE) ||

		    (cinfo->btype == BT_GD5480))

			tmp |= 0x80;



		dev_dbg(info->device, "CL_SEQR1B: %ld\n", (long) tmp);

		dev_dbg(info->device, "CL_SEQR1B: %d\n", (int) 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)

		/* 1280x1024 */
@@ -1917,9 +1922,14 @@ static unsigned int __devinit cirrusfb_get_memsize(struct fb_info *info, 
						   u8 __iomem *regbase)

{

	unsigned long mem;

	unsigned char SRF;

	struct cirrusfb_info *cinfo = info->par;



	SRF = vga_rseq(regbase, CL_SEQRF);

	if (cinfo->btype == BT_LAGUNA) {

		unsigned char SR14 = vga_rseq(regbase, CL_SEQR14);



		mem = ((SR14 & 7) + 1) << 20;

	} else {

		unsigned char SRF = vga_rseq(regbase, CL_SEQRF);

		switch ((SRF & 0x18)) {

		case 0x08:

			mem = 512 * 1024;
@@ -1927,21 +1937,22 @@ static unsigned int __devinit cirrusfb_get_memsize(struct fb_info *info, 
		case 0x10:

			mem = 1024 * 1024;

			break;

	/* 64-bit DRAM data bus width; assume 2MB. Also indicates 2MB memory

	 * on the 5430.

		/* 64-bit DRAM data bus width; assume 2MB.

		 * Also indicates 2MB memory on the 5430.

		 */

		case 0x18:

			mem = 2048 * 1024;

			break;

		default:

		dev_warn(info->device, "CLgenfb: Unknown memory size!\n");

			dev_warn(info->device, "Unknown memory size!\n");

			mem = 1024 * 1024;

		}

	if (SRF & 0x80)

	/* If DRAM bank switching is enabled, there must be twice as much

	 * memory installed. (4MB on the 5434)

		/* If DRAM bank switching is enabled, there must be

		 * twice as much memory installed. (4MB on the 5434)

		 */

		if (SRF & 0x80)

			mem *= 2;

	}



	/* TODO: Handling of GD5446/5480 (see XF86 sources ...) */

	return mem;