]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - android-sdk/kernel-video.git/commitdiff
OMAPDSS: DSSCOMP: WA: dsscomp header changes for WB support
authorVaradarajan, Charulatha <charu@ti.com>
Tue, 2 Apr 2013 14:02:21 +0000 (09:02 -0500)
committerPraneeth Bajjuri <praneeth@ti.com>
Fri, 12 Jul 2013 22:41:44 +0000 (17:41 -0500)
Sync Android file system's userspace and kernel 3.4 space dsscomp
header files. Current Android file system has changes for writeback
handling. Until writeback kernel patches are available for
K3.4, this workaround patch is required.

Change-Id: Ibf7dd95de85ce05bbbde07dc55c435adce15fb46
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
include/video/dsscomp.h

index c6def77f5c8154eed09dc7dcf347c187ba5aa22d..00210be5f5d555b7734c5fcd26575135f694c9f9 100644 (file)
@@ -77,6 +77,22 @@ enum omap_color_mode {
        OMAP_DSS_COLOR_XRGB16_1555      = 1 << 18, /* xRGB16-1555 */
 };
 
        OMAP_DSS_COLOR_XRGB16_1555      = 1 << 18, /* xRGB16-1555 */
 };
 
+/* Writeback data structures */
+enum omap_writeback_source {
+       OMAP_WB_LCD1            = 0,
+       OMAP_WB_TV              = 1,
+       OMAP_WB_LCD2            = 2,
+       OMAP_WB_GFX             = 3,
+       OMAP_WB_VID1            = 4,
+       OMAP_WB_VID2            = 5,
+       OMAP_WB_VID3            = 6,
+};
+
+enum omap_writeback_mode {
+       OMAP_WB_CAPTURE_MODE    = 0,
+       OMAP_WB_MEM2MEM_MODE    = 1,
+};
+
 enum omap_dss_trans_key_type {
        OMAP_DSS_COLOR_KEY_GFX_DST = 0,
        OMAP_DSS_COLOR_KEY_VID_SRC = 1,
 enum omap_dss_trans_key_type {
        OMAP_DSS_COLOR_KEY_GFX_DST = 0,
        OMAP_DSS_COLOR_KEY_VID_SRC = 1,
@@ -355,6 +371,8 @@ struct dss2_ovl_cfg {
        struct omap_dss_cconv_coefs cconv;
        struct dss2_vc1_range_map_info vc1;
 
        struct omap_dss_cconv_coefs cconv;
        struct dss2_vc1_range_map_info vc1;
 
+       __u8 wb_source; /* pipe: is source or not, wb: capture device id */
+       enum omap_writeback_mode wb_mode;
        __u8 ix;        /* ovl index same as sysfs/overlay# */
        __u8 zorder;    /* 0..3 */
        __u8 enabled;   /* bool */
        __u8 ix;        /* ovl index same as sysfs/overlay# */
        __u8 zorder;    /* 0..3 */
        __u8 enabled;   /* bool */