diff options
author | Antonino A. Daplas <adaplas@gmail.com> | 2005-11-09 00:39:11 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 10:56:34 -0500 |
commit | 6cc50e1c5b57180fd37a31282000f43859b0fe73 (patch) | |
tree | 109d99a52b1533358445233dd16a5dfadcb618ce | |
parent | 9c44e5f6c211a9b7313ded897f3135ef7d9ad3e2 (diff) |
[PATCH] fbcon: Console Rotation - Add support to rotate font bitmap
Add support to rotate the font bitmap. To save on processing time, the entire
fontdata will be rotated on a console switch, then stored in a buffer private
to fbcon. To further save on processing, the fontdata will only be rotated if
the font has changed or if the angle of rotation has changed. Only a single
copy of the rotated fontdata will be kept.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/video/console/Makefile | 3 | ||||
-rw-r--r-- | drivers/video/console/fbcon.h | 4 | ||||
-rw-r--r-- | drivers/video/console/fbcon_rotate.c | 105 | ||||
-rw-r--r-- | drivers/video/console/fbcon_rotate.h | 102 |
4 files changed, 214 insertions, 0 deletions
diff --git a/drivers/video/console/Makefile b/drivers/video/console/Makefile index 5222628accce..4532bdfa94fc 100644 --- a/drivers/video/console/Makefile +++ b/drivers/video/console/Makefile | |||
@@ -31,6 +31,9 @@ obj-$(CONFIG_FRAMEBUFFER_CONSOLE) += fbcon.o bitblit.o font.o softcursor.o | |||
31 | ifeq ($(CONFIG_FB_TILEBLITTING),y) | 31 | ifeq ($(CONFIG_FB_TILEBLITTING),y) |
32 | obj-$(CONFIG_FRAMEBUFFER_CONSOLE) += tileblit.o | 32 | obj-$(CONFIG_FRAMEBUFFER_CONSOLE) += tileblit.o |
33 | endif | 33 | endif |
34 | ifeq ($(CONFIG_FRAMEBUFFER_CONSOLE_ROTATION),y) | ||
35 | obj-$(CONFIG_FRAMEBUFFER_CONSOLE) += fbcon_rotate.o | ||
36 | endif | ||
34 | 37 | ||
35 | obj-$(CONFIG_FB_STI) += sticore.o font.o | 38 | obj-$(CONFIG_FB_STI) += sticore.o font.o |
36 | 39 | ||
diff --git a/drivers/video/console/fbcon.h b/drivers/video/console/fbcon.h index 846a5a4e736c..accfd7bd8e93 100644 --- a/drivers/video/console/fbcon.h +++ b/drivers/video/console/fbcon.h | |||
@@ -215,7 +215,11 @@ static inline int get_attribute(struct fb_info *info, u16 c) | |||
215 | (void) (&_r == &_v); \ | 215 | (void) (&_r == &_v); \ |
216 | (i == FB_ROTATE_UR || i == FB_ROTATE_UD) ? _r : _v; }) | 216 | (i == FB_ROTATE_UR || i == FB_ROTATE_UD) ? _r : _v; }) |
217 | 217 | ||
218 | #ifdef CONFIG_FRAMEBUFFER_CONSOLE_ROTATION | ||
219 | extern void fbcon_set_rotate(struct fbcon_ops *ops); | ||
220 | #else | ||
218 | #define fbcon_set_rotate(x) do {} while(0) | 221 | #define fbcon_set_rotate(x) do {} while(0) |
222 | #endif /* CONFIG_FRAMEBUFFER_CONSOLE_ROTATION */ | ||
219 | 223 | ||
220 | #endif /* _VIDEO_FBCON_H */ | 224 | #endif /* _VIDEO_FBCON_H */ |
221 | 225 | ||
diff --git a/drivers/video/console/fbcon_rotate.c b/drivers/video/console/fbcon_rotate.c new file mode 100644 index 000000000000..6a969318480f --- /dev/null +++ b/drivers/video/console/fbcon_rotate.c | |||
@@ -0,0 +1,105 @@ | |||
1 | /* | ||
2 | * linux/drivers/video/console/fbcon_rotate.c -- Software Rotation | ||
3 | * | ||
4 | * Copyright (C) 2005 Antonino Daplas <adaplas @pol.net> | ||
5 | * | ||
6 | * This file is subject to the terms and conditions of the GNU General Public | ||
7 | * License. See the file COPYING in the main directory of this archive for | ||
8 | * more details. | ||
9 | */ | ||
10 | |||
11 | #include <linux/config.h> | ||
12 | #include <linux/module.h> | ||
13 | #include <linux/string.h> | ||
14 | #include <linux/fb.h> | ||
15 | #include <linux/vt_kern.h> | ||
16 | #include <linux/console.h> | ||
17 | #include <asm/types.h> | ||
18 | #include "fbcon.h" | ||
19 | #include "fbcon_rotate.h" | ||
20 | |||
21 | static int fbcon_rotate_font(struct fb_info *info, struct vc_data *vc, | ||
22 | struct display *p) | ||
23 | { | ||
24 | struct fbcon_ops *ops = info->fbcon_par; | ||
25 | int len, err = 0; | ||
26 | int s_cellsize, d_cellsize, i; | ||
27 | const u8 *src; | ||
28 | u8 *dst; | ||
29 | |||
30 | if (vc->vc_font.data == ops->fontdata && | ||
31 | p->con_rotate == ops->cur_rotate) | ||
32 | goto finished; | ||
33 | |||
34 | src = ops->fontdata = vc->vc_font.data; | ||
35 | ops->cur_rotate = p->con_rotate; | ||
36 | len = (!p->userfont) ? 256 : FNTCHARCNT(src); | ||
37 | s_cellsize = ((vc->vc_font.width + 7)/8) * | ||
38 | vc->vc_font.height; | ||
39 | d_cellsize = s_cellsize; | ||
40 | |||
41 | if (ops->rotate == FB_ROTATE_CW || | ||
42 | ops->rotate == FB_ROTATE_CCW) | ||
43 | d_cellsize = ((vc->vc_font.height + 7)/8) * | ||
44 | vc->vc_font.width; | ||
45 | |||
46 | if (info->fbops->fb_sync) | ||
47 | info->fbops->fb_sync(info); | ||
48 | |||
49 | if (ops->fd_size < d_cellsize * len) { | ||
50 | dst = kmalloc(d_cellsize * len, GFP_KERNEL); | ||
51 | |||
52 | if (dst == NULL) { | ||
53 | err = -ENOMEM; | ||
54 | goto finished; | ||
55 | } | ||
56 | |||
57 | ops->fd_size = d_cellsize * len; | ||
58 | kfree(ops->fontbuffer); | ||
59 | ops->fontbuffer = dst; | ||
60 | } | ||
61 | |||
62 | dst = ops->fontbuffer; | ||
63 | memset(dst, 0, ops->fd_size); | ||
64 | |||
65 | switch (ops->rotate) { | ||
66 | case FB_ROTATE_UD: | ||
67 | for (i = len; i--; ) { | ||
68 | rotate_ud(src, dst, vc->vc_font.width, | ||
69 | vc->vc_font.height); | ||
70 | |||
71 | src += s_cellsize; | ||
72 | dst += d_cellsize; | ||
73 | } | ||
74 | break; | ||
75 | case FB_ROTATE_CW: | ||
76 | for (i = len; i--; ) { | ||
77 | rotate_cw(src, dst, vc->vc_font.width, | ||
78 | vc->vc_font.height); | ||
79 | src += s_cellsize; | ||
80 | dst += d_cellsize; | ||
81 | } | ||
82 | break; | ||
83 | case FB_ROTATE_CCW: | ||
84 | for (i = len; i--; ) { | ||
85 | rotate_ccw(src, dst, vc->vc_font.width, | ||
86 | vc->vc_font.height); | ||
87 | src += s_cellsize; | ||
88 | dst += d_cellsize; | ||
89 | } | ||
90 | break; | ||
91 | } | ||
92 | |||
93 | finished: | ||
94 | return err; | ||
95 | } | ||
96 | |||
97 | void fbcon_set_rotate(struct fbcon_ops *ops) | ||
98 | { | ||
99 | ops->rotate_font = fbcon_rotate_font; | ||
100 | } | ||
101 | EXPORT_SYMBOL(fbcon_set_rotate); | ||
102 | |||
103 | MODULE_AUTHOR("Antonino Daplas <adaplas@pol.net>"); | ||
104 | MODULE_DESCRIPTION("Console Rotation Support"); | ||
105 | MODULE_LICENSE("GPL"); | ||
diff --git a/drivers/video/console/fbcon_rotate.h b/drivers/video/console/fbcon_rotate.h new file mode 100644 index 000000000000..6cc27d8e5d45 --- /dev/null +++ b/drivers/video/console/fbcon_rotate.h | |||
@@ -0,0 +1,102 @@ | |||
1 | /* | ||
2 | * linux/drivers/video/console/fbcon_rotate.h -- Software Display Rotation | ||
3 | * | ||
4 | * Copyright (C) 2005 Antonino Daplas <adaplas@pol.net> | ||
5 | * | ||
6 | * This file is subject to the terms and conditions of the GNU General Public | ||
7 | * License. See the file COPYING in the main directory of this archive | ||
8 | * for more details. | ||
9 | */ | ||
10 | |||
11 | #ifndef _FBCON_ROTATE_H | ||
12 | #define _FBCON_ROTATE_H | ||
13 | |||
14 | #define FNTCHARCNT(fd) (((int *)(fd))[-3]) | ||
15 | |||
16 | #define GETVYRES(s,i) ({ \ | ||
17 | (s == SCROLL_REDRAW || s == SCROLL_MOVE) ? \ | ||
18 | (i)->var.yres : (i)->var.yres_virtual; }) | ||
19 | |||
20 | #define GETVXRES(s,i) ({ \ | ||
21 | (s == SCROLL_REDRAW || s == SCROLL_MOVE || !(i)->fix.xpanstep) ? \ | ||
22 | (i)->var.xres : (i)->var.xres_virtual; }) | ||
23 | |||
24 | /* | ||
25 | * The bitmap is always big endian | ||
26 | */ | ||
27 | #if defined(__LITTLE_ENDIAN) | ||
28 | #define FBCON_BIT(b) (7 - (b)) | ||
29 | #else | ||
30 | #define FBCON_BIT(b) (b) | ||
31 | #endif | ||
32 | |||
33 | static inline int pattern_test_bit(u32 x, u32 y, u32 pitch, const char *pat) | ||
34 | { | ||
35 | u32 tmp = (y * pitch) + x, index = tmp / 8, bit = tmp % 8; | ||
36 | |||
37 | pat +=index; | ||
38 | return (test_bit(FBCON_BIT(bit), (void *)pat)); | ||
39 | } | ||
40 | |||
41 | static inline void pattern_set_bit(u32 x, u32 y, u32 pitch, char *pat) | ||
42 | { | ||
43 | u32 tmp = (y * pitch) + x, index = tmp / 8, bit = tmp % 8; | ||
44 | |||
45 | pat += index; | ||
46 | set_bit(FBCON_BIT(bit), (void *)pat); | ||
47 | } | ||
48 | |||
49 | static inline void rotate_ud(const char *in, char *out, u32 width, u32 height) | ||
50 | { | ||
51 | int i, j; | ||
52 | int shift = width % 8; | ||
53 | |||
54 | width = (width + 7) & ~7; | ||
55 | |||
56 | for (i = 0; i < height; i++) { | ||
57 | for (j = 0; j < width; j++) { | ||
58 | if (pattern_test_bit(j, i, width, in)) | ||
59 | pattern_set_bit(width - (1 + j + shift), | ||
60 | height - (1 + i), | ||
61 | width, out); | ||
62 | } | ||
63 | |||
64 | } | ||
65 | } | ||
66 | |||
67 | static inline void rotate_cw(const char *in, char *out, u32 width, u32 height) | ||
68 | { | ||
69 | int i, j, h = height, w = width; | ||
70 | int shift = (8 - (height % 8)) & 7; | ||
71 | |||
72 | width = (width + 7) & ~7; | ||
73 | height = (height + 7) & ~7; | ||
74 | |||
75 | for (i = 0; i < h; i++) { | ||
76 | for (j = 0; j < w; j++) { | ||
77 | if (pattern_test_bit(j, i, width, in)) | ||
78 | pattern_set_bit(height - 1 - i - shift, j, | ||
79 | height, out); | ||
80 | |||
81 | } | ||
82 | } | ||
83 | } | ||
84 | |||
85 | static inline void rotate_ccw(const char *in, char *out, u32 width, u32 height) | ||
86 | { | ||
87 | int i, j, h = height, w = width; | ||
88 | int shift = width % 8; | ||
89 | |||
90 | width = (width + 7) & ~7; | ||
91 | height = (height + 7) & ~7; | ||
92 | |||
93 | for (i = 0; i < h; i++) { | ||
94 | for (j = 0; j < w; j++) { | ||
95 | if (pattern_test_bit(j, i, width, in)) | ||
96 | pattern_set_bit(i, width - 1 - j - shift, | ||
97 | height, out); | ||
98 | } | ||
99 | } | ||
100 | } | ||
101 | |||
102 | #endif | ||