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>

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 {
 };
 
 /* planar */
-#define MBXFB_FMT_YUV12         0
+#define MBXFB_FMT_YUV16         0
+#define MBXFB_FMT_YUV12         1
 
 /* packed */
-#define MBXFB_FMT_UY0VY1        1
-#define MBXFB_FMT_VY0UY1        2
-#define MBXFB_FMT_Y0UY1V        3
-#define MBXFB_FMT_Y0VY1U        4
+#define MBXFB_FMT_UY0VY1        2
+#define MBXFB_FMT_VY0UY1        3
+#define MBXFB_FMT_Y0UY1V        4
+#define MBXFB_FMT_Y0VY1U        5
 struct mbxfb_overlaySetup {
         __u32 enable;
         __u32 x, y;
         __u32 width, height;
-        __u32 alpha;
         __u32 fmt;
         __u32 mem_offset;
         __u32 scaled_width;
@@ -54,6 +54,45 @@ struct mbxfb_overlaySetup {
         __u16 UV_stride;
 };
 
-#define MBXFB_IOCX_OVERLAY      _IOWR(0xF4, 0x00,struct mbxfb_overlaySetup)
+#define MBXFB_ALPHABLEND_NONE           0
+#define MBXFB_ALPHABLEND_GLOBAL         1
+#define MBXFB_ALPHABLEND_PIXEL          2
+
+#define MBXFB_COLORKEY_DISABLED         0
+#define MBXFB_COLORKEY_PREVIOUS         1
+#define MBXFB_COLORKEY_CURRENT          2
+struct mbxfb_alphaCtl {
+        __u8 overlay_blend_mode;
+        __u8 overlay_colorkey_mode;
+        __u8 overlay_global_alpha;
+        __u32 overlay_colorkey;
+        __u32 overlay_colorkey_mask;
+
+        __u8 graphics_blend_mode;
+        __u8 graphics_colorkey_mode;
+        __u8 graphics_global_alpha;
+        __u32 graphics_colorkey;
+        __u32 graphics_colorkey_mask;
+};
+
+#define MBXFB_PLANE_GRAPHICS    0
+#define MBXFB_PLANE_VIDEO       1
+struct mbxfb_planeorder {
+        __u8 bottom;
+        __u8 top;
+};
+
+struct mbxfb_reg {
+        __u32 addr;     /* offset from 0x03fe 0000 */
+        __u32 val;              /* value */
+        __u32 mask;             /* which bits to touch (for write) */
+};
+
+#define MBXFB_IOCX_OVERLAY              _IOWR(0xF4, 0x00,struct mbxfb_overlaySetup)
+#define MBXFB_IOCG_ALPHA                _IOR(0xF4, 0x01,struct mbxfb_alphaCtl)
+#define MBXFB_IOCS_ALPHA                _IOW(0xF4, 0x02,struct mbxfb_alphaCtl)
+#define MBXFB_IOCS_PLANEORDER   _IOR(0xF4, 0x03,struct mbxfb_planeorder)
+#define MBXFB_IOCS_REG                  _IOW(0xF4, 0x04,struct mbxfb_reg)
+#define MBXFB_IOCX_REG                  _IOWR(0xF4, 0x05,struct mbxfb_reg)
 
 #endif /* __MBX_FB_H */