diff options
author | Raphael Assenat <raph@8d.com> | 2007-10-16 04:28:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:43:14 -0400 |
commit | ba282daa919f89c871780f344a71e5403a70b634 (patch) | |
tree | bbe7422999670f7c9fcc07b924963f9cd450840e /include | |
parent | eb78f9b3fa8532057d2a45acbe415b27ece6341b (diff) |
mbxfb: Improvements and new features
This contains the following changes:
* Overlay surface alpha is configured separately from the overlay. This
prevents display glitches (configure and fill the overlay first, set
alpha to a visible value next)
* Added an ioctl for configuring transparency of the Overlay and graphics
planes. Blend mode, colorkey mode and global alpha mode are supported.
* Added an ioctl for setting the plane order. The overlay plance can be placed
over or
under the graphics plane.
* Added an ioctl for setting and reading chip registers, with mask.
* Updated copyright for 2007
[adaplas]
* Coding style changes
Signed-off-by: Raphael Assenat <raph@8d.com>
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/video/mbxfb.h | 53 |
1 files changed, 46 insertions, 7 deletions
diff --git a/include/video/mbxfb.h b/include/video/mbxfb.h index 20b9002712ef..ea18961fc5e7 100644 --- a/include/video/mbxfb.h +++ b/include/video/mbxfb.h | |||
@@ -29,18 +29,18 @@ struct mbxfb_platform_data { | |||
29 | }; | 29 | }; |
30 | 30 | ||
31 | /* planar */ | 31 | /* planar */ |
32 | #define MBXFB_FMT_YUV12 0 | 32 | #define MBXFB_FMT_YUV16 0 |
33 | #define MBXFB_FMT_YUV12 1 | ||
33 | 34 | ||
34 | /* packed */ | 35 | /* packed */ |
35 | #define MBXFB_FMT_UY0VY1 1 | 36 | #define MBXFB_FMT_UY0VY1 2 |
36 | #define MBXFB_FMT_VY0UY1 2 | 37 | #define MBXFB_FMT_VY0UY1 3 |
37 | #define MBXFB_FMT_Y0UY1V 3 | 38 | #define MBXFB_FMT_Y0UY1V 4 |
38 | #define MBXFB_FMT_Y0VY1U 4 | 39 | #define MBXFB_FMT_Y0VY1U 5 |
39 | struct mbxfb_overlaySetup { | 40 | struct mbxfb_overlaySetup { |
40 | __u32 enable; | 41 | __u32 enable; |
41 | __u32 x, y; | 42 | __u32 x, y; |
42 | __u32 width, height; | 43 | __u32 width, height; |
43 | __u32 alpha; | ||
44 | __u32 fmt; | 44 | __u32 fmt; |
45 | __u32 mem_offset; | 45 | __u32 mem_offset; |
46 | __u32 scaled_width; | 46 | __u32 scaled_width; |
@@ -54,6 +54,45 @@ struct mbxfb_overlaySetup { | |||
54 | __u16 UV_stride; | 54 | __u16 UV_stride; |
55 | }; | 55 | }; |
56 | 56 | ||
57 | #define MBXFB_IOCX_OVERLAY _IOWR(0xF4, 0x00,struct mbxfb_overlaySetup) | 57 | #define MBXFB_ALPHABLEND_NONE 0 |
58 | #define MBXFB_ALPHABLEND_GLOBAL 1 | ||
59 | #define MBXFB_ALPHABLEND_PIXEL 2 | ||
60 | |||
61 | #define MBXFB_COLORKEY_DISABLED 0 | ||
62 | #define MBXFB_COLORKEY_PREVIOUS 1 | ||
63 | #define MBXFB_COLORKEY_CURRENT 2 | ||
64 | struct mbxfb_alphaCtl { | ||
65 | __u8 overlay_blend_mode; | ||
66 | __u8 overlay_colorkey_mode; | ||
67 | __u8 overlay_global_alpha; | ||
68 | __u32 overlay_colorkey; | ||
69 | __u32 overlay_colorkey_mask; | ||
70 | |||
71 | __u8 graphics_blend_mode; | ||
72 | __u8 graphics_colorkey_mode; | ||
73 | __u8 graphics_global_alpha; | ||
74 | __u32 graphics_colorkey; | ||
75 | __u32 graphics_colorkey_mask; | ||
76 | }; | ||
77 | |||
78 | #define MBXFB_PLANE_GRAPHICS 0 | ||
79 | #define MBXFB_PLANE_VIDEO 1 | ||
80 | struct mbxfb_planeorder { | ||
81 | __u8 bottom; | ||
82 | __u8 top; | ||
83 | }; | ||
84 | |||
85 | struct mbxfb_reg { | ||
86 | __u32 addr; /* offset from 0x03fe 0000 */ | ||
87 | __u32 val; /* value */ | ||
88 | __u32 mask; /* which bits to touch (for write) */ | ||
89 | }; | ||
90 | |||
91 | #define MBXFB_IOCX_OVERLAY _IOWR(0xF4, 0x00,struct mbxfb_overlaySetup) | ||
92 | #define MBXFB_IOCG_ALPHA _IOR(0xF4, 0x01,struct mbxfb_alphaCtl) | ||
93 | #define MBXFB_IOCS_ALPHA _IOW(0xF4, 0x02,struct mbxfb_alphaCtl) | ||
94 | #define MBXFB_IOCS_PLANEORDER _IOR(0xF4, 0x03,struct mbxfb_planeorder) | ||
95 | #define MBXFB_IOCS_REG _IOW(0xF4, 0x04,struct mbxfb_reg) | ||
96 | #define MBXFB_IOCX_REG _IOWR(0xF4, 0x05,struct mbxfb_reg) | ||
58 | 97 | ||
59 | #endif /* __MBX_FB_H */ | 98 | #endif /* __MBX_FB_H */ |