summaryrefslogtreecommitdiffstats
path: root/drivers/video/cfb_console.c
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-06-07 08:35:36 -0400
committerTom Rini <trini@ti.com>2013-06-07 08:35:36 -0400
commit47b8e527448c94d09fc8dbdb6601ea7a605ff955 (patch)
treeadcd698c960e2001de700b09d7b0ec0a42616aec /drivers/video/cfb_console.c
parent38d240dcf87923d49607ce2f243a0ac1c62612ca (diff)
parentea697ae7eb059d7467c6854ce562c31df510eb59 (diff)
downloadtalos-obmc-uboot-47b8e527448c94d09fc8dbdb6601ea7a605ff955.tar.gz
talos-obmc-uboot-47b8e527448c94d09fc8dbdb6601ea7a605ff955.zip
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'drivers/video/cfb_console.c')
-rw-r--r--drivers/video/cfb_console.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index 0793f07f24..b10f1590ba 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -572,8 +572,6 @@ static void video_drawchars(int xx, int yy, unsigned char *s, int count)
SWAP32((video_font_draw_table32
[bits & 15][3] & eorx) ^ bgx);
}
- if (cfb_do_flush_cache)
- flush_cache((ulong)dest0, 32);
dest0 += VIDEO_FONT_WIDTH * VIDEO_PIXEL_SIZE;
s++;
}
@@ -642,8 +640,6 @@ static void video_invertchar(int xx, int yy)
for (x = firstx; x < lastx; x++) {
u8 *dest = (u8 *)(video_fb_address) + x + y;
*dest = ~*dest;
- if (cfb_do_flush_cache)
- flush_cache((ulong)dest, 4);
}
}
}
@@ -687,6 +683,8 @@ void console_cursor(int state)
}
cursor_state = state;
}
+ if (cfb_do_flush_cache)
+ flush_cache(VIDEO_FB_ADRS, VIDEO_SIZE);
}
#endif
@@ -739,8 +737,6 @@ static void console_clear_line(int line, int begin, int end)
memsetl(offset + i * VIDEO_LINE_LEN, size, bgx);
}
#endif
- if (cfb_do_flush_cache)
- flush_cache((ulong)CONSOLE_ROW_FIRST, CONSOLE_SIZE);
}
static void console_scrollup(void)
@@ -1146,6 +1142,8 @@ void video_putc(const char c)
#else
parse_putc(c);
#endif
+ if (cfb_do_flush_cache)
+ flush_cache(VIDEO_FB_ADRS, VIDEO_SIZE);
}
void video_puts(const char *s)
@@ -1799,6 +1797,8 @@ int video_display_bitmap(ulong bmp_image, int x, int y)
}
#endif
+ if (cfb_do_flush_cache)
+ flush_cache(VIDEO_FB_ADRS, VIDEO_SIZE);
return (0);
}
#endif
@@ -2209,6 +2209,9 @@ static int video_init(void)
console_col = 0;
console_row = 0;
+ if (cfb_do_flush_cache)
+ flush_cache(VIDEO_FB_ADRS, VIDEO_SIZE);
+
return 0;
}
OpenPOWER on IntegriCloud