patch-2.3.23 linux/drivers/video/chipsfb.c

• Lines: 51
• Date: Mon Oct 18 11:37:43 1999
• Orig file: v2.3.22/linux/drivers/video/chipsfb.c
• Orig date: Mon Oct 11 15:38:15 1999

diff -u --recursive --new-file v2.3.22/linux/drivers/video/chipsfb.c linux/drivers/video/chipsfb.c
@@ -282,6 +282,14 @@
 	// useful at blank = 1 too (saves battery, extends backlight life)
 	if (blank) {
 		pmu_enable_backlight(0);
+		/* get the palette from the chip */
+		for (i = 0; i < 256; ++i) {
+			out_8(p->io_base + 0x3c7, i);
+			udelay(1);
+			p->palette[i].red = in_8(p->io_base + 0x3c9);
+			p->palette[i].green = in_8(p->io_base + 0x3c9);
+			p->palette[i].blue = in_8(p->io_base + 0x3c9);
+		}
 		for (i = 0; i < 256; ++i) {
 			out_8(p->io_base + 0x3c8, i);
 			udelay(1);
@@ -291,7 +299,13 @@
 		}
 	} else {
 		pmu_enable_backlight(1);
-		do_install_cmap(currcon, info);
+		for (i = 0; i < 256; ++i) {
+			out_8(p->io_base + 0x3c8, i);
+			udelay(1);
+			out_8(p->io_base + 0x3c9, p->palette[i].red);
+			out_8(p->io_base + 0x3c9, p->palette[i].green);
+			out_8(p->io_base + 0x3c9, p->palette[i].blue);
+		}
 	}
 }
 
@@ -711,20 +725,10 @@
 
 	for (p = all_chips; p != NULL; p = p->next) {
 		int nb = p->var.yres * p->fix.line_length;
-		int i;
 
 		switch (when) {
 		case PBOOK_SLEEP_NOW:
 			chipsfb_blank(1, (struct fb_info *)p);
-			/* get the palette from the chip, Xpmac seems
-			   to set it directly in the chip */
-			for (i = 0; i < 256; ++i) {
-				out_8(p->io_base + 0x3c8, i);
-				udelay(1);
-				p->palette[i].red = in_8(p->io_base + 0x3c9);
-				p->palette[i].green = in_8(p->io_base + 0x3c9);
-				p->palette[i].blue = in_8(p->io_base + 0x3c9);
-			}
 			p->save_framebuffer = vmalloc(nb);
 			if (p->save_framebuffer)
 				memcpy(p->save_framebuffer,