hc
2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390
kernel/drivers/video/fbdev/core/fbcon.h
....@@ -25,11 +25,13 @@
2525 * low-level frame buffer device
2626 */
2727
28
-struct display {
28
+struct fbcon_display {
2929 /* Filled in by the low-level console driver */
3030 const u_char *fontdata;
3131 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
3335 u_short inverse; /* != 0 text black on white as default */
3436 short yscroll; /* Hardware scrolling */
3537 int vrows; /* number of virtual rows */
....@@ -68,7 +70,7 @@
6870 struct fb_var_screeninfo var; /* copy of the current fb_var_screeninfo */
6971 struct timer_list cursor_timer; /* Cursor timer */
7072 struct fb_cursor cursor_state;
71
- struct display *p;
73
+ struct fbcon_display *p;
7274 struct fb_info *info;
7375 int currcon; /* Current VC. */
7476 int cur_blink_jiffies;
....@@ -208,6 +210,17 @@
208210 #define SCROLL_REDRAW 0x004
209211 #define SCROLL_PAN_REDRAW 0x005
210212
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
+
211224 #ifdef CONFIG_FB_TILEBLITTING
212225 extern void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info);
213226 #endif
....@@ -218,7 +231,7 @@
218231 #define FBCON_ATTRIBUTE_REVERSE 2
219232 #define FBCON_ATTRIBUTE_BOLD 4
220233
221
-static inline int real_y(struct display *p, int ypos)
234
+static inline int real_y(struct fbcon_display *p, int ypos)
222235 {
223236 int rows = p->vrows;
224237