]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
OMAP3 DSS: Fixed FIFO buffer register field sizes
authorKalle Jokiniemi <ext-kalle.jokiniemi@nokia.com>
Wed, 22 Oct 2008 06:47:06 +0000 (09:47 +0300)
committerTony Lindgren <tony@atomide.com>
Fri, 24 Oct 2008 19:36:09 +0000 (12:36 -0700)
The size status field in DISPC_[GFX | VID1 | VID2]_FIFO_SIZE_STATUS
register is 11 bits wide in OMAP3, but only 9 bits were read. Similarly,
the threshold field in DISPC_[GFX | VID1 | VID2]_FIFO_THRESHOLD register
is 12 bits wide, while only 9 bits were written in it.

This patch extends the bit field sizes used in setup_plane_fifo to
correspond to ones in OMAP3. In OMAP2 the extra bits are reserved, so no
harm should come from extending the bit fields.

Signed-off-by: Kalle Jokiniemi <ext-kalle.jokiniemi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
drivers/video/omap/dispc.c

index beda40b23768d4a7d33e7d765138c025a39c7877..c140c214223c64545ba9f6d303776ea24301428f 100644 (file)
@@ -290,7 +290,7 @@ static void setup_plane_fifo(int plane, int ext_mode)
        BUG_ON(plane > 2);
 
        l = dispc_read_reg(fsz_reg[plane]);
-       l &= FLD_MASK(0, 9);
+       l &= FLD_MASK(0, 11);
        if (ext_mode) {
                low = l * 3 / 4;
                high = l;
@@ -298,7 +298,7 @@ static void setup_plane_fifo(int plane, int ext_mode)
                low = l / 4;
                high = l * 3 / 4;
        }
-       MOD_REG_FLD(ftrs_reg[plane], FLD_MASK(16, 9) | FLD_MASK(0, 9),
+       MOD_REG_FLD(ftrs_reg[plane], FLD_MASK(16, 12) | FLD_MASK(0, 12),
                        (high << 16) | low);
 }