.. | .. |
---|
25 | 25 | * low-level frame buffer device |
---|
26 | 26 | */ |
---|
27 | 27 | |
---|
28 | | -struct display { |
---|
| 28 | +struct fbcon_display { |
---|
29 | 29 | /* Filled in by the low-level console driver */ |
---|
30 | 30 | const u_char *fontdata; |
---|
31 | 31 | int userfont; /* != 0 if fontdata kmalloc()ed */ |
---|
32 | | - u_short scrollmode; /* Scroll Method */ |
---|
| 32 | +#ifdef CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION |
---|
| 33 | + u_short scrollmode; /* Scroll Method, use fb_scrollmode() */ |
---|
| 34 | +#endif |
---|
33 | 35 | u_short inverse; /* != 0 text black on white as default */ |
---|
34 | 36 | short yscroll; /* Hardware scrolling */ |
---|
35 | 37 | int vrows; /* number of virtual rows */ |
---|
.. | .. |
---|
68 | 70 | struct fb_var_screeninfo var; /* copy of the current fb_var_screeninfo */ |
---|
69 | 71 | struct timer_list cursor_timer; /* Cursor timer */ |
---|
70 | 72 | struct fb_cursor cursor_state; |
---|
71 | | - struct display *p; |
---|
| 73 | + struct fbcon_display *p; |
---|
72 | 74 | struct fb_info *info; |
---|
73 | 75 | int currcon; /* Current VC. */ |
---|
74 | 76 | int cur_blink_jiffies; |
---|
.. | .. |
---|
208 | 210 | #define SCROLL_REDRAW 0x004 |
---|
209 | 211 | #define SCROLL_PAN_REDRAW 0x005 |
---|
210 | 212 | |
---|
| 213 | +static inline u_short fb_scrollmode(struct fbcon_display *fb) |
---|
| 214 | +{ |
---|
| 215 | +#ifdef CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION |
---|
| 216 | + return fb->scrollmode; |
---|
| 217 | +#else |
---|
| 218 | + /* hardcoded to SCROLL_REDRAW if acceleration was disabled. */ |
---|
| 219 | + return SCROLL_REDRAW; |
---|
| 220 | +#endif |
---|
| 221 | +} |
---|
| 222 | + |
---|
| 223 | + |
---|
211 | 224 | #ifdef CONFIG_FB_TILEBLITTING |
---|
212 | 225 | extern void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info); |
---|
213 | 226 | #endif |
---|
.. | .. |
---|
218 | 231 | #define FBCON_ATTRIBUTE_REVERSE 2 |
---|
219 | 232 | #define FBCON_ATTRIBUTE_BOLD 4 |
---|
220 | 233 | |
---|
221 | | -static inline int real_y(struct display *p, int ypos) |
---|
| 234 | +static inline int real_y(struct fbcon_display *p, int ypos) |
---|
222 | 235 | { |
---|
223 | 236 | int rows = p->vrows; |
---|
224 | 237 | |
---|