X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Ftdm_private_types.h;h=a5b44233456d9ba0ff77032a20c6c1670da200c2;hb=a87e1609d7c2be6fafbfba39fd930adcc0d23491;hp=a406ecda9262e4889fead1dc0fd98752e3054119;hpb=ae652c71b3b123682832bd4d5b60b24de8628cb9;p=platform%2Fcore%2Fuifw%2Flibtdm.git

diff --git a/src/tdm_private_types.h b/src/tdm_private_types.h
index a406ecd..a5b4423 100644
--- a/src/tdm_private_types.h
+++ b/src/tdm_private_types.h
@@ -60,10 +60,11 @@ enum {
 	TDM_DEBUG_NONE,
 	TDM_DEBUG_BUFFER    = (1 << 0),
 	TDM_DEBUG_MUTEX     = (1 << 1),
-	TDM_DEBUG_THREAD    = (1 << 2),
-	TDM_DEBUG_SERVER    = (1 << 3),
-	TDM_DEBUG_VBLANK    = (1 << 4),
-	TDM_DEBUG_COMMIT    = (1 << 5),
+	TDM_DEBUG_EVENT     = (1 << 2),
+	TDM_DEBUG_THREAD    = (1 << 3),
+	TDM_DEBUG_SERVER    = (1 << 4),
+	TDM_DEBUG_VBLANK    = (1 << 5),
+	TDM_DEBUG_COMMIT    = (1 << 6),
 };
 
 enum {
@@ -95,6 +96,7 @@ typedef enum {
 	TDM_COMMIT_TYPE_LAYER,
 } tdm_commit_type;
 
+typedef struct _tdm_private_module tdm_private_module;
 typedef struct _tdm_private_display tdm_private_display;
 typedef struct _tdm_private_output tdm_private_output;
 typedef struct _tdm_private_layer tdm_private_layer;
@@ -104,25 +106,25 @@ typedef struct _tdm_private_capture tdm_private_capture;
 typedef struct _tdm_private_loop tdm_private_loop;
 typedef struct _tdm_private_server tdm_private_server;
 typedef struct _tdm_private_thread tdm_private_thread;
-typedef struct _tdm_private_vblank_handler tdm_private_vblank_handler;
+typedef struct _tdm_private_output_change_handler tdm_private_output_change_handler;
 typedef struct _tdm_private_output_commit_handler tdm_private_output_commit_handler;
+typedef struct _tdm_private_output_vblank_handler tdm_private_output_vblank_handler;
 typedef struct _tdm_private_layer_commit_handler tdm_private_layer_commit_handler;
-typedef struct _tdm_private_change_handler tdm_private_change_handler;
+typedef struct _tdm_private_hwc_window_commit_handler tdm_private_hwc_window_commit_handler;
+typedef struct _tdm_private_output_hwc_target_buffer_window_commit_handler tdm_private_output_hwc_target_buffer_commit_handler;
+
 typedef struct _tdm_private_layer_buffer tdm_private_layer_buffer;
 
-struct _tdm_private_display {
-	pthread_mutex_t lock;
-	unsigned int init_count;
+struct _tdm_private_module {
+	struct list_head link;
+
+	tdm_private_display *private_display;
 
 	/* backend module info */
 	void *module;
 	tdm_backend_module *module_data;
 	tdm_backend_data *bdata;
 
-#ifdef INIT_BUFMGR
-	tbm_bufmgr bufmgr;
-#endif
-
 	/* backend function */
 	tdm_display_capability capabilities;
 	tdm_func_display func_display;
@@ -142,20 +144,39 @@ struct _tdm_private_display {
 	struct list_head pp_list;
 	struct list_head capture_list;
 
-	void **outputs_ptr;
+	/* backend output objects. allocated in backend. freed in frontend. ordered */
+	tdm_output **outputs;
+
+	int fd;
+	tdm_event_loop_source *event_source;
+};
+
+struct _tdm_private_display {
+	pthread_mutex_t lock;
+	unsigned int init_count;
+
+	double stamp;
+
+#ifdef INIT_BUFMGR
+	tbm_bufmgr bufmgr;
+#endif
+
+	struct list_head module_list;
+	tdm_private_module *current_module;  //setted only when loading
+	tdm_private_module *pp_module;       //pp-support backend
+	tdm_private_module *capture_module;  //TODO: remove later
 
 	/* for event handling */
 	tdm_private_loop *private_loop;
 
-	/* output order */
-	tdm_output **outputs;
-
 	int print_fps;
 };
 
 struct _tdm_private_output {
 	struct list_head link;
 
+	tdm_private_module *private_module;
+
 	int index;
 	double stamp;
 
@@ -186,14 +207,12 @@ struct _tdm_private_output {
 	tdm_vblank *vblank;
 	int layer_waiting_vblank;
 
-	/* seperate list for multi-thread*/
-	struct list_head change_handler_list_main;
-	struct list_head change_handler_list_sub;
+	tdm_event_loop_source *vblank_timeout_timer;
+	unsigned int vblank_timeout_timer_expired;
 
-	void **layers_ptr;
+	struct list_head change_handler_list;
 
-	/* TODO: temp solution for handling DPMS things in sub-htread */
-	tdm_event_loop_source *dpms_changed_timer;
+	void **layers_ptr;
 
 	struct {
 		/* look at the tdm_output_set_need_revalidate_handler()	declaration for the details */
@@ -202,17 +221,24 @@ struct _tdm_private_output {
 		tdm_event_loop_source *event_source;
 	} need_validate;
 
+	tdm_info_layer target_buffer_info; /* layer_info for the target_buffer */
+
 	/* calling a output commit per a vblank */
 	int commit_per_vblank;
 	tdm_commit_type commit_type;
 
 	/* for ttrace vblank */
 	tdm_vblank *ttrace_vblank;
+
+	/* hwc */
+	int need_set_target_info;
 };
 
 struct _tdm_private_layer {
 	struct list_head link;
 
+	tdm_private_module *private_module;
+
 	int index;
 
 	tdm_private_display *private_display;
@@ -249,7 +275,6 @@ struct _tdm_private_hwc_window {
 	struct list_head link;
 
 	int index;
-	uint32_t zpos;
 
 	tdm_private_display *private_display;
 	tdm_private_output *private_output;
@@ -260,11 +285,13 @@ struct _tdm_private_hwc_window {
 struct _tdm_private_pp {
 	struct list_head link;
 
+	tdm_private_module *private_module;
+
 	double stamp;
 
 	tdm_private_display *private_display;
 
-	tdm_pp *pp_backend;
+	tdm_pp *pp_module;
 
 	struct list_head pending_buffer_list;
 	struct list_head buffer_list;
@@ -280,6 +307,8 @@ struct _tdm_private_capture {
 	struct list_head link;
 	struct list_head display_link;
 
+	tdm_private_module *private_module;
+
 	double stamp;
 
 	tdm_capture_target target;
@@ -288,7 +317,7 @@ struct _tdm_private_capture {
 	tdm_private_output *private_output;
 	tdm_private_layer *private_layer;
 
-	tdm_capture *capture_backend;
+	tdm_capture *capture_module;
 
 	struct list_head pending_buffer_list;
 	struct list_head buffer_list;
@@ -313,9 +342,6 @@ struct _tdm_private_loop {
 	struct wl_display *wl_display;
 	struct wl_event_loop *wl_loop;
 
-	int backend_fd;
-	tdm_event_loop_source *backend_source;
-
 	/* In event loop, all resources are accessed by this dpy.
 	 * CAUTION:
 	 * - DO NOT include other private structure in this structure because this
@@ -332,7 +358,7 @@ struct _tdm_private_loop {
 	tdm_private_thread *private_thread;
 };
 
-struct _tdm_private_vblank_handler {
+struct _tdm_private_output_vblank_handler {
 	struct list_head link;
 
 	tdm_private_output *private_output;
@@ -341,37 +367,51 @@ struct _tdm_private_vblank_handler {
 	tdm_output_vblank_handler func;
 	void *user_data;
 
+	unsigned int sent_to_frontend;
+
 	pid_t owner_tid;
 };
 
-struct _tdm_private_output_commit_handler {
+struct _tdm_private_output_change_handler {
 	struct list_head link;
 
 	tdm_private_output *private_output;
-	tdm_output_commit_handler func;
+	tdm_output_change_handler func;
 	void *user_data;
 
 	pid_t owner_tid;
 };
 
-struct _tdm_private_layer_commit_handler {
+struct _tdm_private_output_commit_handler {
 	struct list_head link;
 
-	tdm_private_layer *private_layer;
-	tdm_layer_commit_handler func;
+	tdm_private_output *private_output;
+	tdm_output_commit_handler func;
 	void *user_data;
 
-	tdm_private_layer_buffer *committed_buffer;   /* for layer_commit */
+	pid_t owner_tid;
 };
 
-struct _tdm_private_change_handler {
-	struct list_head link;
+struct _tdm_private_hwc_window_commit_handler {
+	tdm_private_hwc_window *private_hwc_window;
+	tdm_hwc_window_commit_handler func;
+	void *user_data;
+};
 
+struct _tdm_private_output_hwc_target_buffer_window_commit_handler {
 	tdm_private_output *private_output;
-	tdm_output_change_handler func;
+	tdm_output_hwc_target_buffer_commit_handler func;
 	void *user_data;
+};
 
-	pid_t owner_tid;
+struct _tdm_private_layer_commit_handler {
+	struct list_head link;
+
+	tdm_private_layer *private_layer;
+	tdm_layer_commit_handler func;
+	void *user_data;
+
+	tdm_private_layer_buffer *committed_buffer;   /* for layer_commit */
 };
 
 struct _tdm_private_layer_buffer {
@@ -416,13 +456,14 @@ typedef enum {
 	TDM_THREAD_CB_VBLANK_SW,
 	TDM_THREAD_CB_VBLANK_CREATE,
 	TDM_THREAD_CB_NEED_VALIDATE,
+	TDM_THREAD_CB_MAX,
 } tdm_thread_cb_type;
 
 typedef struct _tdm_thread_cb_base tdm_thread_cb_base;
 typedef struct _tdm_thread_cb_output_vblank tdm_thread_cb_output_commit;
 typedef struct _tdm_thread_cb_output_vblank tdm_thread_cb_output_vblank;
-typedef struct _tdm_thread_cb_output_status tdm_thread_cb_output_status;
 typedef struct _tdm_thread_cb_output_dpms tdm_thread_cb_output_dpms;
+typedef struct _tdm_thread_cb_output_status tdm_thread_cb_output_status;
 typedef struct _tdm_thread_cb_pp_done tdm_thread_cb_pp_done;
 typedef struct _tdm_thread_cb_capture_done tdm_thread_cb_capture_done;
 typedef struct _tdm_thread_cb_vblank_sw tdm_thread_cb_vblank_sw;
@@ -432,49 +473,41 @@ typedef struct _tdm_thread_cb_need_validate tdm_thread_cb_need_validate;
 struct _tdm_thread_cb_base {
 	tdm_thread_cb_type type;
 	unsigned int length;
+	double object_stamp;
+	void *data;
+	unsigned int sync;
 };
 
 struct _tdm_thread_cb_output_vblank {
 	tdm_thread_cb_base base;
-	double output_stamp;
 	unsigned int sequence;
 	unsigned int tv_sec;
 	unsigned int tv_usec;
-	void *user_data;
 };
 
 struct _tdm_thread_cb_output_status {
 	tdm_thread_cb_base base;
-	double output_stamp;
 	tdm_output_conn_status status;
-	void *user_data;
 };
 
 struct _tdm_thread_cb_output_dpms {
 	tdm_thread_cb_base base;
-	double output_stamp;
 	tdm_output_dpms dpms;
-	void *user_data;
 };
 
 struct _tdm_thread_cb_pp_done {
 	tdm_thread_cb_base base;
-	double pp_stamp;
 	tbm_surface_h src;
 	tbm_surface_h dst;
-	void *user_data;
 };
 
 struct _tdm_thread_cb_capture_done {
 	tdm_thread_cb_base base;
-	double capture_stamp;
 	tbm_surface_h buffer;
-	void *user_data;
 };
 
 struct _tdm_thread_cb_vblank_sw {
 	tdm_thread_cb_base base;
-	double vblank_stamp;
 };
 
 struct _tdm_thread_cb_vblank_create {
@@ -484,7 +517,6 @@ struct _tdm_thread_cb_vblank_create {
 
 struct _tdm_thread_cb_need_validate {
 	tdm_thread_cb_base base;
-	tdm_private_output *o;
 };
 
 struct argument_details {