[kernel] r11707 - in dists/trunk/linux-2.6/debian: . patches/bugfix/mips patches/series

[Martin Michlmayr]

Author: tbm
Date: Thu Jun 26 10:21:38 2008
New Revision: 11707

Log:
gbefb: fix cmap FIFO timeout


Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/mips/gbefb_fix_cmap_fifo_timeout.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Jun 26 10:21:38 2008
@@ -74,6 +74,7 @@
   * [mips] Add fixes from Thomas Bogendoerfer:
     - IP22: Set MIPS_L1_CACHE_SHIFT to 7
     - IP32: fix unexpected irq 71
+    - gbefb: fix cmap FIFO timeout
 
   [ Ian Campbell ]
   * Readme.build updated on how to generate orig tarballs.

Added: dists/trunk/linux-2.6/debian/patches/bugfix/mips/gbefb_fix_cmap_fifo_timeout.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/mips/gbefb_fix_cmap_fifo_timeout.patch	Thu Jun 26 10:21:38 2008
@@ -0,0 +1,110 @@
+Writes to the cmap fifo while the display is blanked caused cmap FIFO
+timeout messages and a wrong colormap. To avoid this the driver now
+maintains a colormap in memory and updates the colormap after the
+display is unblanked.
+
+Signed-off-by: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
+---
+
+ drivers/video/gbefb.c |   50 +++++++++++++++++++++++++++++++++---------------
+ 1 files changed, 34 insertions(+), 16 deletions(-)
+
+diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c
+index 2e552d5..f89c3cc 100644
+--- a/drivers/video/gbefb.c
++++ b/drivers/video/gbefb.c
+@@ -87,6 +87,8 @@ static int gbe_revision;
+ static int ypan, ywrap;
+ 
+ static uint32_t pseudo_palette[16];
++static uint32_t gbe_cmap[256];
++static int gbe_turned_on; /* 0 turned off, 1 turned on */
+ 
+ static char *mode_option __initdata = NULL;
+ 
+@@ -208,6 +210,8 @@ void gbe_turn_off(void)
+ 	int i;
+ 	unsigned int val, x, y, vpixen_off;
+ 
++	gbe_turned_on = 0;
++
+ 	/* check if pixel counter is on */
+ 	val = gbe->vt_xy;
+ 	if (GET_GBE_FIELD(VT_XY, FREEZE, val) == 1)
+@@ -371,6 +375,22 @@ static void gbe_turn_on(void)
+ 	}
+ 	if (i == 10000)
+ 		printk(KERN_ERR "gbefb: turn on DMA timed out\n");
++
++	gbe_turned_on = 1;
++}
++
++static void gbe_loadcmap(void)
++{
++	int i, j;
++
++	for (i = 0; i < 256; i++) {
++		for (j = 0; j < 1000 && gbe->cm_fifo >= 63; j++)
++			udelay(10);
++		if (j == 1000)
++			printk(KERN_ERR "gbefb: cmap FIFO timeout\n");
++
++		gbe->cmap[i] = gbe_cmap[i];
++	}
+ }
+ 
+ /*
+@@ -382,6 +402,7 @@ static int gbefb_blank(int blank, struct fb_info *info)
+ 	switch (blank) {
+ 	case FB_BLANK_UNBLANK:		/* unblank */
+ 		gbe_turn_on();
++		gbe_loadcmap();
+ 		break;
+ 
+ 	case FB_BLANK_NORMAL:		/* blank */
+@@ -796,16 +817,10 @@ static int gbefb_set_par(struct fb_info *info)
+ 		gbe->gmap[i] = (i << 24) | (i << 16) | (i << 8);
+ 
+ 	/* Initialize the color map */
+-	for (i = 0; i < 256; i++) {
+-		int j;
+-
+-		for (j = 0; j < 1000 && gbe->cm_fifo >= 63; j++)
+-			udelay(10);
+-		if (j == 1000)
+-			printk(KERN_ERR "gbefb: cmap FIFO timeout\n");
++	for (i = 0; i < 256; i++)
++		gbe_cmap[i] = (i << 8) | (i << 16) | (i << 24);
+ 
+-		gbe->cmap[i] = (i << 8) | (i << 16) | (i << 24);
+-	}
++	gbe_loadcmap();
+ 
+ 	return 0;
+ }
+@@ -855,14 +870,17 @@ static int gbefb_setcolreg(unsigned regno, unsigned red, unsigned green,
+ 	blue >>= 8;
+ 
+ 	if (info->var.bits_per_pixel <= 8) {
+-		/* wait for the color map FIFO to have a free entry */
+-		for (i = 0; i < 1000 && gbe->cm_fifo >= 63; i++)
+-			udelay(10);
+-		if (i == 1000) {
+-			printk(KERN_ERR "gbefb: cmap FIFO timeout\n");
+-			return 1;
++		gbe_cmap[regno] = (red << 24) | (green << 16) | (blue << 8);
++		if (gbe_turned_on) {
++			/* wait for the color map FIFO to have a free entry */
++			for (i = 0; i < 1000 && gbe->cm_fifo >= 63; i++)
++				udelay(10);
++			if (i == 1000) {
++				printk(KERN_ERR "gbefb: cmap FIFO timeout\n");
++				return 1;
++			}
++			gbe->cmap[regno] = gbe_cmap[regno];
+ 		}
+-		gbe->cmap[regno] = (red << 24) | (green << 16) | (blue << 8);
+ 	} else if (regno < 16) {
+ 		switch (info->var.bits_per_pixel) {
+ 		case 15:
+

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Thu Jun 26 10:21:38 2008
@@ -24,6 +24,7 @@
 + bugfix/mips/disable-advansys.patch
 + bugfix/mips/ip32_fix_unexpected_irq_71.patch
 + bugfix/mips/ip22_cache_shift.patch
++ bugfix/mips/gbefb_fix_cmap_fifo_timeout.patch
 + bugfix/arm/disable-dvb_b2c2_flexcop.patch
 + bugfix/arm/disable-dvb_budget.patch
 + bugfix/arm/disable-netxen_nic.patch