diff options
Diffstat (limited to 'drivers/video/console/tileblit.c')
-rw-r--r-- | drivers/video/console/tileblit.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/video/console/tileblit.c b/drivers/video/console/tileblit.c index cb25324a5635..153352ca9461 100644 --- a/drivers/video/console/tileblit.c +++ b/drivers/video/console/tileblit.c | |||
@@ -80,9 +80,8 @@ static void tile_clear_margins(struct vc_data *vc, struct fb_info *info, | |||
80 | return; | 80 | return; |
81 | } | 81 | } |
82 | 82 | ||
83 | static void tile_cursor(struct vc_data *vc, struct fb_info *info, | 83 | static void tile_cursor(struct vc_data *vc, struct fb_info *info, int mode, |
84 | struct display *p, int mode, int softback_lines, | 84 | int softback_lines, int fg, int bg) |
85 | int fg, int bg) | ||
86 | { | 85 | { |
87 | struct fb_tilecursor cursor; | 86 | struct fb_tilecursor cursor; |
88 | int use_sw = (vc->vc_cursor_type & 0x01); | 87 | int use_sw = (vc->vc_cursor_type & 0x01); |
@@ -130,10 +129,10 @@ static int tile_update_start(struct fb_info *info) | |||
130 | return err; | 129 | return err; |
131 | } | 130 | } |
132 | 131 | ||
133 | void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info, | 132 | void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info) |
134 | struct display *p, struct fbcon_ops *ops) | ||
135 | { | 133 | { |
136 | struct fb_tilemap map; | 134 | struct fb_tilemap map; |
135 | struct fbcon_ops *ops = info->fbcon_par; | ||
137 | 136 | ||
138 | ops->bmove = tile_bmove; | 137 | ops->bmove = tile_bmove; |
139 | ops->clear = tile_clear; | 138 | ops->clear = tile_clear; |
@@ -142,13 +141,13 @@ void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info, | |||
142 | ops->cursor = tile_cursor; | 141 | ops->cursor = tile_cursor; |
143 | ops->update_start = tile_update_start; | 142 | ops->update_start = tile_update_start; |
144 | 143 | ||
145 | if (p) { | 144 | if (ops->p) { |
146 | map.width = vc->vc_font.width; | 145 | map.width = vc->vc_font.width; |
147 | map.height = vc->vc_font.height; | 146 | map.height = vc->vc_font.height; |
148 | map.depth = 1; | 147 | map.depth = 1; |
149 | map.length = (p->userfont) ? | 148 | map.length = (ops->p->userfont) ? |
150 | FNTCHARCNT(p->fontdata) : 256; | 149 | FNTCHARCNT(ops->p->fontdata) : 256; |
151 | map.data = p->fontdata; | 150 | map.data = ops->p->fontdata; |
152 | info->tileops->fb_settile(info, &map); | 151 | info->tileops->fb_settile(info, &map); |
153 | } | 152 | } |
154 | } | 153 | } |