From 94963af28e445384e19775a838a29e6a71708179 Mon Sep 17 00:00:00 2001 From: Erik Gilling Date: Tue, 13 Dec 2011 14:48:51 -0800 Subject: [PATCH] update video/dsscomp.h Change-Id: I9da47f7fb7f34f9c4baa860bb767cb8fd4f8020c Signed-off-by: Erik Gilling --- libc/kernel/common/video/dsscomp.h | 57 ++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/libc/kernel/common/video/dsscomp.h b/libc/kernel/common/video/dsscomp.h index 4c79d2454..575071fd4 100644 --- a/libc/kernel/common/video/dsscomp.h +++ b/libc/kernel/common/video/dsscomp.h @@ -234,136 +234,139 @@ enum omapdss_buffer_addressing_type { OMAP_DSS_BUFADDR_BYTYPE, OMAP_DSS_BUFADDR_ION, OMAP_DSS_BUFADDR_GRALLOC, -}; + OMAP_DSS_BUFADDR_OVL_IX, /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + OMAP_DSS_BUFADDR_LAYER_IX, + OMAP_DSS_BUFADDR_FB, +}; struct dss2_ovl_info { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct dss2_ovl_cfg cfg; enum omapdss_buffer_addressing_type addressing; union { -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ void *address; void *uv_address; }; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ enum omapdss_buffer_type ba_type; enum omapdss_buffer_type uv_type; }; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u32 ba; __u32 uv; }; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; struct dss2_mgr_info { __u32 ix; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u32 default_color; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ enum omap_dss_trans_key_type trans_key_type; __u32 trans_key; struct omap_dss_cpr_coefs cpr_coefs; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u8 trans_enabled; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u8 interlaced; __u8 alpha_blending; __u8 cpr_enabled; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u8 swap_rb; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ } __attribute__ ((aligned(4))); enum dsscomp_setup_mode { DSSCOMP_SETUP_MODE_APPLY = (1 << 0), -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ DSSCOMP_SETUP_MODE_DISPLAY = (1 << 1), +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ DSSCOMP_SETUP_MODE_CAPTURE = (1 << 2), DSSCOMP_SETUP_APPLY = DSSCOMP_SETUP_MODE_APPLY, DSSCOMP_SETUP_DISPLAY = -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ DSSCOMP_SETUP_MODE_APPLY | DSSCOMP_SETUP_MODE_DISPLAY, +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ DSSCOMP_SETUP_CAPTURE = DSSCOMP_SETUP_MODE_APPLY | DSSCOMP_SETUP_MODE_CAPTURE, DSSCOMP_SETUP_DISPLAY_CAPTURE = -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ DSSCOMP_SETUP_DISPLAY | DSSCOMP_SETUP_CAPTURE, +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; struct dsscomp_setup_mgr_data { __u32 sync_id; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct dss2_rect_t win; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ enum dsscomp_setup_mode mode; __u16 num_ovls; __u16 get_sync_obj; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct dss2_mgr_info mgr; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct dss2_ovl_info ovls[0]; }; struct dsscomp_check_ovl_data { -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ enum dsscomp_setup_mode mode; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct dss2_mgr_info mgr; struct dss2_ovl_info ovl; }; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct dsscomp_setup_dispc_data { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u32 sync_id; enum dsscomp_setup_mode mode; __u16 num_ovls; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u16 num_mgrs; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u16 get_sync_obj; struct dss2_mgr_info mgrs[3]; struct dss2_ovl_info ovls[5]; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct dsscomp_wb_copy_data { struct dss2_ovl_info ovl, wb; }; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct dsscomp_display_info { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u32 ix; __u32 overlays_available; __u32 overlays_owned; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ enum omap_channel channel; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ enum omap_dss_display_state state; __u8 enabled; struct omap_video_timings timings; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct s3d_disp_info s3d_info; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct dss2_mgr_info mgr; __u16 width_in_mm; __u16 height_in_mm; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u32 modedb_len; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct dsscomp_videomode modedb[]; }; struct dsscomp_setup_display_data { -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u32 ix; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct dsscomp_videomode mode; }; enum dsscomp_wait_phase { -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ DSSCOMP_WAIT_PROGRAMMED = 1, +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ DSSCOMP_WAIT_DISPLAYED, DSSCOMP_WAIT_RELEASED, }; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct dsscomp_wait_data { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u32 timeout_us; enum dsscomp_wait_phase phase; }; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define DSSCIOC_SETUP_MGR _IOW('O', 128, struct dsscomp_setup_mgr_data) +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define DSSCIOC_CHECK_OVL _IOWR('O', 129, struct dsscomp_check_ovl_data) #define DSSCIOC_WB_COPY _IOW('O', 130, struct dsscomp_wb_copy_data) #define DSSCIOC_QUERY_DISPLAY _IOWR('O', 131, struct dsscomp_display_info) -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define DSSCIOC_WAIT _IOW('O', 132, struct dsscomp_wait_data) +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define DSSCIOC_SETUP_DISPC _IOW('O', 133, struct dsscomp_setup_dispc_data) #define DSSCIOC_SETUP_DISPLAY _IOW('O', 134, struct dsscomp_setup_display_data) #endif -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ -- 2.11.0