lkml.org 
[lkml]   [2004]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 3/3] fbdev: fix scrolling corruption
Date
This patches fixes the following:

- scrolling corruption if scrolling mode is SCROLL_PAN_MOVE. This bug
was introduced by the tile blitting patch.

- flashing cursor even when console is blanked

Signed-off-by: Antonino Daplas <adaplas@pol.net>
---

fbcon.c | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)

diff -uprN linux-2.6.9-rc1-mm5-orig/drivers/video/console/fbcon.c linux-2.6.9-rc1-mm5/drivers/video/console/fbcon.c
--- linux-2.6.9-rc1-mm5-orig/drivers/video/console/fbcon.c 2004-09-13 21:49:01.000000000 +0800
+++ linux-2.6.9-rc1-mm5/drivers/video/console/fbcon.c 2004-09-13 22:24:33.027181792 +0800
@@ -1160,10 +1160,11 @@ static __inline__ void ypan_up(struct vc
{
struct fb_info *info = registered_fb[(int) con2fb_map[vc->vc_num]];
struct display *p = &fb_display[vc->vc_num];
-
+ struct fbcon_ops *ops = (struct fbcon_ops *) info->fbcon_par;
+
p->yscroll += count;
if (p->yscroll > p->vrows - vc->vc_rows) {
- fbcon_bmove(vc, p->vrows - vc->vc_rows,
+ ops->bmove(vc, info, p->vrows - vc->vc_rows,
0, 0, 0, vc->vc_rows, vc->vc_cols);
p->yscroll -= p->vrows - vc->vc_rows;
}
@@ -1207,10 +1208,11 @@ static __inline__ void ypan_down(struct
{
struct fb_info *info = registered_fb[(int) con2fb_map[vc->vc_num]];
struct display *p = &fb_display[vc->vc_num];
+ struct fbcon_ops *ops = (struct fbcon_ops *) info->fbcon_par;

p->yscroll -= count;
if (p->yscroll < 0) {
- fbcon_bmove(vc, 0, 0, p->vrows - vc->vc_rows,
+ ops->bmove(vc, info, 0, 0, p->vrows - vc->vc_rows,
0, vc->vc_rows, vc->vc_cols);
p->yscroll += p->vrows - vc->vc_rows;
}
@@ -1461,6 +1463,7 @@ static int fbcon_scroll(struct vc_data *
{
struct fb_info *info = registered_fb[(int) con2fb_map[vc->vc_num]];
struct display *p = &fb_display[vc->vc_num];
+ struct fbcon_ops *ops = (struct fbcon_ops *) info->fbcon_par;
int scroll_partial = info->flags & FBINFO_PARTIAL_PAN_OK;

if (!info->fbops->fb_blank && console_blanked)
@@ -1487,10 +1490,10 @@ static int fbcon_scroll(struct vc_data *
goto redraw_up;
switch (p->scrollmode) {
case SCROLL_MOVE:
- fbcon_bmove(vc, t + count, 0, t, 0,
+ ops->bmove(vc, info, t + count, 0, t, 0,
b - t - count, vc->vc_cols);
- fbcon_clear(vc, b - count, 0, count,
- vc->vc_cols);
+ ops->clear(vc, info, b - count, 0, count,
+ vc->vc_cols);
break;

case SCROLL_WRAP_MOVE:
@@ -1571,9 +1574,9 @@ static int fbcon_scroll(struct vc_data *
count = vc->vc_rows;
switch (p->scrollmode) {
case SCROLL_MOVE:
- fbcon_bmove(vc, t, 0, t + count, 0,
+ ops->bmove(vc, info, t, 0, t + count, 0,
b - t - count, vc->vc_cols);
- fbcon_clear(vc, t, 0, count, vc->vc_cols);
+ ops->clear(vc, info, t, 0, count, vc->vc_cols);
break;

case SCROLL_WRAP_MOVE:
@@ -1948,6 +1951,7 @@ static int fbcon_blank(struct vc_data *v
}

fbcon_cursor(vc, blank ? CM_ERASE : CM_DRAW);
+ info->cursor.flash = (!blank);

if (!info->fbops->fb_blank) {
if (blank) {

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 14:06    [W:0.050 / U:0.052 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site