Merge branch 'tizen' into sandbox/cyeon/devel
[platform/core/uifw/libtdm.git] / src / tdm_private.h
index 13e0610..6788ba1 100644 (file)
@@ -9,7 +9,7 @@
  *          Taeheon Kim <th908.kim@samsung.com>,
  *          YoungJun Cho <yj44.cho@samsung.com>,
  *          SooChan Lim <sc1.lim@samsung.com>,
- *          Boram Park <sc1.lim@samsung.com>
+ *          Boram Park <boram1288.park@samsung.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
 #include <string.h>
 #include <strings.h>
 #include <stdlib.h>
+#include <assert.h>
 #include <pthread.h>
 #include <errno.h>
 #include <unistd.h>
-#include <limits.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <dirent.h>
 #include <poll.h>
 #include <sys/syscall.h>
-#include <sys/types.h>
+#include <sys/eventfd.h>
 #include <math.h>
 
 #include <wayland-server-protocol.h>
 #include <tbm_bufmgr.h>
 #include <tbm_surface_queue.h>
+#include <tbm_surface_internal.h>
+#include <tbm_drm_helper.h>
 
-#include "tdm_backend.h"
-#include "tdm_log.h"
-#include "tdm_list.h"
+#include "tdm_private_types.h"
 #include "tdm_macro.h"
+#include "tdm_helper.h"
+#include "tdm_thread.h"
+#include "tdm_config.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -69,356 +72,57 @@ extern "C" {
 
 //#define INIT_BUFMGR
 
-/**
- * @file tdm_private.h
- * @brief The private header file for a frontend library
- */
-
-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),
-};
-
-extern int tdm_debug_module;
-extern int tdm_debug_dump;
-
-#ifdef HAVE_TTRACE
-#include <ttrace.h>
-#define TDM_TRACE_BEGIN(NAME) traceBegin(TTRACE_TAG_GRAPHICS, "TDM:"#NAME)
-#define TDM_TRACE_END() traceEnd(TTRACE_TAG_GRAPHICS)
-#define TDM_TRACE_COUNT(NAME, COUNT) traceCounter(TTRACE_TAG_GRAPHICS, COUNT, "TDM:"#NAME)
-#define TDM_TRACE_MARK(NAME) traceMark(TTRACE_TAG_GRAPHICS, "TDM:"#NAME)
-#else
-#define TDM_TRACE_BEGIN(NAME)
-#define TDM_TRACE_END()
-#define TDM_TRACE_COUNT(NAME, COUNT)
-#define TDM_TRACE_MARK(NAME)
-#endif
-
-typedef enum {
-       TDM_CAPTURE_TARGET_OUTPUT,
-       TDM_CAPTURE_TARGET_LAYER,
-} tdm_capture_target;
-
-enum {
-       TDM_DUMP_FLAG_LAYER   = (1 << 0),
-       TDM_DUMP_FLAG_PP      = (1 << 1),
-       TDM_DUMP_FLAG_CAPTURE = (1 << 2),
-};
-
-#define TDM_DUMP_DIR    "/tmp"
-
-typedef enum {
-       TDM_COMMIT_TYPE_NONE,
-       TDM_COMMIT_TYPE_OUTPUT,
-       TDM_COMMIT_TYPE_LAYER,
-} tdm_commit_type;
-
-typedef struct _tdm_private_display tdm_private_display;
-typedef struct _tdm_private_output tdm_private_output;
-typedef struct _tdm_private_layer tdm_private_layer;
-typedef struct _tdm_private_pp tdm_private_pp;
-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_commit_handler tdm_private_output_commit_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_layer_buffer tdm_private_layer_buffer;
-
-struct _tdm_private_display {
-       pthread_mutex_t lock;
-       unsigned int init_count;
-
-       /* 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;
-       tdm_func_output func_output;
-       tdm_func_layer func_layer;
-       tdm_func_pp func_pp;
-       tdm_func_capture func_capture;
-
-       /* backend capability */
-       tdm_caps_display caps_display;
-       tdm_caps_pp caps_pp;
-       tdm_caps_capture caps_capture;
-
-       /* output, pp list */
-       struct list_head output_list;
-       struct list_head pp_list;
-       struct list_head capture_list;
-
-       void **outputs_ptr;
-
-       /* for event handling */
-       tdm_private_loop *private_loop;
-
-       /* output order */
-       tdm_output **outputs;
-
-       /* calling a output commit per a vblank */
-       int commit_per_vblank;
-       tdm_commit_type commit_type;
-
-       int print_fps;
-};
-
-struct _tdm_private_output {
-       struct list_head link;
-
-       int index;
-       double stamp;
-
-       tdm_private_display *private_display;
-
-       tdm_caps_output caps;
-       tdm_output *output_backend;
-
-       unsigned int pipe;
-       tdm_output_dpms current_dpms_value;
-       const tdm_output_mode *current_mode;
-
-       int regist_vblank_cb;
-       int regist_commit_cb;
-       int regist_change_cb;
-       int regist_dpms_cb;
-
-       struct list_head layer_list;
-       struct list_head capture_list;
-       struct list_head vblank_handler_list;
-       struct list_head output_commit_handler_list;
-
-       /* for layer commit */
-       struct list_head layer_commit_handler_list;
-       struct list_head pending_commit_handler_list;
-       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;
-
-       void **layers_ptr;
-
-       /* TODO: temp solution for handling DPMS things in sub-htread */
-       tdm_event_loop_source *dpms_changed_timer;
-};
-
-struct _tdm_private_layer {
-       struct list_head link;
-
-       int index;
-
-       tdm_private_display *private_display;
-       tdm_private_output *private_output;
-
-       tdm_caps_layer caps;
-       tdm_layer *layer_backend;
-
-       /* When a buffer is set to a layer, it will be stored to waiting_buffer.
-        * And when a layer is committed, it will be moved to committed_buffer.
-        * Finally when a commit handler is called, it will be moved to showing_buffer.
-        */
-       tdm_private_layer_buffer *waiting_buffer;
-       tdm_private_layer_buffer *committed_buffer;   /* for output_commit */
-       tdm_private_layer_buffer *showing_buffer;
-       tbm_surface_queue_h buffer_queue;
-
-       struct list_head capture_list;
-
-       unsigned int usable;
-       unsigned int committing;
-
-       double fps_stamp;
-       unsigned int fps_count;
-};
-
-struct _tdm_private_pp {
-       struct list_head link;
+/*****************************************************************************
+ * This file includes
+ *  - other private headers
+ *  - function prototypes
+ *****************************************************************************/
 
-       double stamp;
-
-       tdm_private_display *private_display;
-
-       tdm_pp *pp_backend;
-
-       struct list_head pending_buffer_list;
-       struct list_head buffer_list;
-
-       tdm_info_pp info;
-       pid_t owner_tid;
-
-       tdm_pp_done_handler done_func;
-       void *done_user_data;
-};
-
-struct _tdm_private_capture {
-       struct list_head link;
-       struct list_head display_link;
-
-       double stamp;
-
-       tdm_capture_target target;
-
-       tdm_private_display *private_display;
-       tdm_private_output *private_output;
-       tdm_private_layer *private_layer;
-
-       tdm_capture *capture_backend;
-
-       struct list_head pending_buffer_list;
-       struct list_head buffer_list;
-
-       tdm_info_capture info;
-       pid_t owner_tid;
-
-       tdm_capture_done_handler done_func;
-       void *done_user_data;
-};
-
-/* CAUTION:
- * Note that we don't need to (un)lock mutex to use this structure. If there is
- * no TDM thread, all TDM resources are protected by private_display's mutex.
- * If there is a TDM thread, this struct will be used only in a TDM thread.
- * So, we don't need to protect this structure by mutex. Not thread-safe.
- */
-struct _tdm_private_loop {
-       /* TDM uses wl_event_loop to handle various event sources including the TDM
-        * backend's fd.
-        */
-       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
-        *   struct is not protected by mutex.
-        */
-       tdm_display *dpy;
-
-       /* for handling TDM client requests */
-       tdm_private_server *private_server;
-
-       /* To have a TDM event thread. If TDM_THREAD enviroment variable is not set
-        * private_thread is NULL.
-        */
-       tdm_private_thread *private_thread;
-};
-
-struct _tdm_private_vblank_handler {
-       struct list_head link;
-
-       tdm_private_output *private_output;
-       int interval;
-       int sync;
-       tdm_output_vblank_handler func;
-       void *user_data;
-
-       pid_t owner_tid;
-};
-
-struct _tdm_private_output_commit_handler {
-       struct list_head link;
-
-       tdm_private_output *private_output;
-       tdm_output_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_change_handler {
-       struct list_head link;
-
-       tdm_private_output *private_output;
-       tdm_output_change_handler func;
-       void *user_data;
-
-       pid_t owner_tid;
-};
+extern int tdm_debug_dump;
+extern int tdm_ttrace_module;
+extern int tdm_ttrace_output;
 
-struct _tdm_private_layer_buffer {
-       tbm_surface_h buffer;
-       struct list_head link;
-};
+tdm_private_display *
+tdm_display_get(void);
 
-typedef struct _tdm_buffer_info {
-       tbm_surface_h buffer;
+int
+tdm_module_check_abi(tdm_private_module *private_module, int abimaj, int abimin);
 
-       /* ref_count for backend */
-       int backend_ref_count;
-
-       struct list_head release_funcs;
-       struct list_head destroy_funcs;
+tdm_error
+tdm_display_call_thread_cb_output_create(tdm_private_display *private_display, tdm_output *output);
+void
+tdm_display_thread_cb_output_create(tdm_private_display *private_display, void *object, tdm_thread_cb_base *cb_base, void *user_data);
+void *
+tdm_display_find_output_stamp(tdm_private_display *private_display, double stamp);
+tdm_private_output *
+tdm_display_find_private_output(tdm_private_display *private_display, tdm_output *output_backend);
+unsigned int
+tdm_display_find_empty_output_pipe(tdm_private_display *private_display);
 
-       struct list_head *list;
-       struct list_head link;
-} tdm_buffer_info;
-
-typedef struct _tdm_pp_private_buffer {
-       tbm_surface_h src;
-       tbm_surface_h dst;
-       struct list_head link;
-       struct list_head commit_link;
-} tdm_pp_private_buffer;
-
-typedef struct _tdm_capture_private_buffer {
-       tbm_surface_h buffer;
-       struct list_head link;
-       struct list_head commit_link;
-} tdm_capture_private_buffer;
 
-int
-tdm_display_check_module_abi(tdm_private_display *private_display, int abimaj, int abimin);
+void *
+tdm_display_find_hwc_stamp(tdm_private_display *private_display, double stamp);
+tdm_private_hwc *
+tdm_display_find_private_hwc(tdm_private_display *private_display, tdm_hwc *hwc_backend);
 
-tdm_private_output *
-tdm_display_find_output_stamp(tdm_private_display *private_display, double stamp);
-tdm_private_pp *
-tdm_pp_find_stamp(tdm_private_display *private_display, double stamp);
-tdm_private_capture *
-tdm_capture_find_stamp(tdm_private_display *private_display, double stamp);
+tdm_error
+tdm_output_init(tdm_private_display *private_display);
 
+tdm_error
+tdm_output_call_thread_cb_destroy(tdm_private_output *private_output);
 void
-tdm_output_cb_vblank(tdm_output *output_backend, unsigned int sequence,
-                                        unsigned int tv_sec, unsigned int tv_usec, void *user_data);
+tdm_output_thread_cb_destroy(tdm_private_display *private_display, void *object, tdm_thread_cb_base *cb_base, void *user_data);
 void
-tdm_output_cb_commit(tdm_output *output_backend, unsigned int sequence,
-                                        unsigned int tv_sec, unsigned int tv_usec, void *user_data);
+tdm_output_thread_cb_change(tdm_private_display *private_display, void *object, tdm_thread_cb_base *cb_base, void *user_data);
 void
 tdm_output_cb_status(tdm_output *output_backend, tdm_output_conn_status status,
                                         void *user_data);
 void
 tdm_output_cb_dpms(tdm_output *output_backend, tdm_output_dpms dpms,
                                   void *user_data);
+
+void
+tdm_output_vblank_print_wait_information(tdm_private_output *private_output, void *user_data);
 tdm_error
 tdm_output_wait_vblank_add_front(tdm_output *output, int interval, int sync,
                                                                 tdm_output_vblank_handler func, void *user_data);
@@ -426,6 +130,11 @@ tdm_error
 tdm_output_commit_internal(tdm_output *output, int sync, tdm_output_commit_handler func, void *user_data);
 tdm_error
 tdm_output_get_dpms_internal(tdm_output *output, tdm_output_dpms *dpms_value);
+tdm_error
+tdm_output_get_dpms_changing(tdm_output *output, int *changing);
+
+tdm_error
+tdm_output_choose_commit_per_vblank_mode(tdm_private_output *private_output, int mode);
 
 void
 tdm_output_remove_vblank_handler_internal(tdm_output *output, tdm_output_vblank_handler func, void *user_data);
@@ -433,37 +142,61 @@ void
 tdm_output_remove_commit_handler_internal(tdm_output *output, tdm_output_commit_handler func, void *user_data);
 
 void
-tdm_layer_committed(tdm_private_layer *private_layer, tdm_private_layer_buffer **committed_buffer);
+tdm_output_request_mode_set(tdm_output *output, unsigned int index);
+
+void
+tdm_layer_remove_commit_handler_internal(tdm_layer *layer, tdm_layer_commit_handler func, void *user_data);
 
+tdm_error
+tdm_layer_commit_internal(tdm_private_layer *private_layer, tdm_layer_commit_handler func, void *user_data);
+tdm_error
+tdm_layer_commit_pending_data(tdm_private_layer *private_layer);
 void
-tdm_pp_cb_done(tdm_pp *pp_backend, tbm_surface_h src, tbm_surface_h dst,
-                          void *user_data);
+tdm_layer_committed(tdm_private_layer *private_layer, tdm_private_layer_buffer **committed_buffer);
+tdm_error
+tdm_layer_set_info_internal(tdm_private_layer *private_layer, tdm_info_layer *info);
+tdm_error
+tdm_layer_set_buffer_internal(tdm_private_layer *private_layer, tbm_surface_h buffer);
+tdm_error
+tdm_layer_unset_buffer_internal(tdm_private_layer *private_layer);
 void
-tdm_capture_cb_done(tdm_capture *capture_backend, tbm_surface_h buffer,
-                                       void *user_data);
+tdm_layer_free_buffer(tdm_private_layer *private_layer, tdm_private_layer_buffer *layer_buffer);
+
 tdm_error
-tdm_vblank_cb_vblank_SW(tdm_vblank *vblank, double vblank_stamp);
+tdm_vblank_init(tdm_display *dpy);
+void
+tdm_vblank_deinit(tdm_display *dpy);
 tdm_error
 tdm_vblank_set_add_front(tdm_vblank *vblank, unsigned int add_front);
 tdm_error
 tdm_vblank_set_resource(tdm_vblank *vblank, struct wl_resource *resource);
+double
+tdm_vblank_get_stamp(tdm_vblank *vblank);
 tdm_error
 tdm_vblank_set_client_vblank_fps(unsigned int pid, const char *name, unsigned int fps);
 void
 tdm_vblank_get_vblank_list_information(tdm_display *dpy, char *reply, int *len);
 
-void
-tdm_output_call_change_handler_internal(tdm_private_output *private_output,
-                                                                               struct list_head *change_handler_list,
-                                                                               tdm_output_change_type type,
-                                                                               tdm_value value,
-                                                                               int no_check_thread_id);
-
+tdm_error
+tdm_pp_init(tdm_private_display *private_display);
 tdm_private_pp *
-tdm_pp_create_internal(tdm_private_display *private_display, tdm_error *error);
+tdm_pp_create_internal(tdm_private_module *private_module, tdm_error *error);
 void
 tdm_pp_destroy_internal(tdm_private_pp *private_pp);
 
+tdm_error
+tdm_hwc_init(tdm_private_display *private_display);
+void
+tdm_hwc_set_vblank(unsigned int fps);
+void
+tdm_hwc_unset_vblank(void);
+tdm_hwc_window *
+tdm_hwc_window_create_internal(tdm_private_hwc *private_hwc, tdm_error *error);
+void
+tdm_hwc_window_destroy_internal(tdm_private_hwc_window * private_hwc_window);
+
+tdm_error
+tdm_capture_init(tdm_private_display *private_display);
 tdm_private_capture *
 tdm_capture_create_output_internal(tdm_private_output *private_output,
                                                                   tdm_error *error);
@@ -476,13 +209,6 @@ tdm_capture_destroy_internal(tdm_private_capture *private_capture);
 /* utility buffer functions for private */
 tdm_buffer_info*
 tdm_buffer_get_info(tbm_surface_h buffer);
-tbm_surface_h
-tdm_buffer_list_get_first_entry(struct list_head *list);
-void
-tdm_buffer_list_dump(struct list_head *list);
-
-void
-tdm_buffer_remove_release_handler_internal(tbm_surface_h buffer);
 
 /* event functions for private */
 tdm_error
@@ -490,6 +216,8 @@ tdm_event_loop_init(tdm_private_display *private_display);
 void
 tdm_event_loop_deinit(tdm_private_display *private_display);
 void
+tdm_event_loop_stop(tdm_private_display *private_display);
+void
 tdm_event_loop_create_backend_source(tdm_private_display *private_display);
 int
 tdm_event_loop_get_fd(tdm_private_display *private_display);
@@ -497,197 +225,73 @@ tdm_error
 tdm_event_loop_dispatch(tdm_private_display *private_display);
 void
 tdm_event_loop_flush(tdm_private_display *private_display);
-
-typedef enum {
-       TDM_THREAD_CB_NONE,
-       TDM_THREAD_CB_OUTPUT_COMMIT,
-       TDM_THREAD_CB_OUTPUT_VBLANK,
-       TDM_THREAD_CB_OUTPUT_STATUS,
-       TDM_THREAD_CB_OUTPUT_DPMS,
-       TDM_THREAD_CB_PP_DONE,
-       TDM_THREAD_CB_CAPTURE_DONE,
-       TDM_THREAD_CB_VBLANK_SW,
-} 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_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;
-
-struct _tdm_thread_cb_base {
-       tdm_thread_cb_type type;
-       unsigned int length;
-};
-
-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;
-};
-
-tdm_error
-tdm_thread_init(tdm_private_loop *private_loop);
-void
-tdm_thread_deinit(tdm_private_loop *private_loop);
-int
-tdm_thread_get_fd(tdm_private_loop *private_loop);
-tdm_error
-tdm_thread_send_cb(tdm_private_loop *private_loop, tdm_thread_cb_base *base);
 tdm_error
-tdm_thread_handle_cb(tdm_private_loop *private_loop);
-int
-tdm_thread_in_display_thread(pid_t tid);
-int
-tdm_thread_is_running(void);
+tdm_event_loop_trace_enable(tdm_private_display *private_display, unsigned int enable);
 
 tdm_error
 tdm_server_init(tdm_private_loop *private_loop);
 void
 tdm_server_deinit(tdm_private_loop *private_loop);
+const char*
+tdm_server_get_client_name(pid_t pid);
+tdm_error
+tdm_server_enable_ttrace_client_vblank(tdm_display *dpy, tdm_output *output, int enable);
 
 char *
 tdm_helper_dump_make_directory(const char *path, char *reply, int *len);
-void
-tdm_helper_dump_buffer_str(tbm_surface_h buffer, char *dir, char *str);
 double
 tdm_helper_get_time(void);
 
-extern pthread_mutex_t tdm_mutex_check_lock;
-extern int tdm_mutex_locked;
-extern const char *tdm_mutex_lock_func;
-extern int tdm_mutex_lock_line;
-extern const char *tdm_mutex_unlock_func;
-extern int tdm_mutex_unlock_line;
 extern int tdm_dump_enable;
 extern char *tdm_debug_dump_dir;
 
-#define _pthread_mutex_unlock(l) \
-       do { \
-               if (tdm_debug_module & TDM_DEBUG_MUTEX) \
-                       TDM_INFO("mutex unlock"); \
-               pthread_mutex_lock(&tdm_mutex_check_lock); \
-               tdm_mutex_locked = 0; \
-               tdm_mutex_lock_func = NULL; \
-               tdm_mutex_lock_line = 0; \
-               tdm_mutex_unlock_func = __FUNCTION__; \
-               tdm_mutex_unlock_line = __LINE__; \
-               pthread_mutex_unlock(&tdm_mutex_check_lock); \
-               pthread_mutex_unlock(l); \
-       } while (0)
-#ifdef TDM_CONFIG_MUTEX_TIMEOUT
-#define MUTEX_TIMEOUT_SEC 5
-#define _pthread_mutex_lock(l) \
-       do { \
-               if (tdm_debug_module & TDM_DEBUG_MUTEX) \
-                       TDM_INFO("mutex lock"); \
-               struct timespec rtime; \
-               clock_gettime(CLOCK_REALTIME, &rtime); \
-               rtime.tv_sec += MUTEX_TIMEOUT_SEC; \
-               if (pthread_mutex_timedlock(l, &rtime)) { \
-                       TDM_ERR("Mutex lock failed PID %d", getpid()); \
-                       _pthread_mutex_unlock(l); \
-               } \
-               else { \
-                       pthread_mutex_lock(&tdm_mutex_check_lock); \
-                       tdm_mutex_locked = 1; \
-                       tdm_mutex_lock_func = __FUNCTION__; \
-                       tdm_mutex_lock_line = __LINE__; \
-                       tdm_mutex_unlock_func = NULL; \
-                       tdm_mutex_unlock_line = 0; \
-                       pthread_mutex_unlock(&tdm_mutex_check_lock); \
-               } \
-       } while (0)
-#else //TDM_CONFIG_MUTEX_TIMEOUT
-#define _pthread_mutex_lock(l) \
-       do { \
-               if (tdm_debug_module & TDM_DEBUG_MUTEX) \
-                       TDM_INFO("mutex lock"); \
-               pthread_mutex_lock(l); \
-               pthread_mutex_lock(&tdm_mutex_check_lock); \
-               tdm_mutex_locked = 1; \
-               tdm_mutex_lock_func = __FUNCTION__; \
-               tdm_mutex_lock_line = __LINE__; \
-               tdm_mutex_unlock_func = NULL; \
-               tdm_mutex_unlock_line = 0; \
-               pthread_mutex_unlock(&tdm_mutex_check_lock); \
-       } while (0)
-#endif //TDM_CONFIG_MUTEX_TIMEOUT
-//#define TDM_MUTEX_IS_LOCKED() (tdm_mutex_locked == 1)
-static inline int TDM_MUTEX_IS_LOCKED(void)
-{
-       int ret;
-       /* if thread is not running, we don't need to consider mutex things. */
-       if (!tdm_thread_is_running())
-               return 1;
-       pthread_mutex_lock(&tdm_mutex_check_lock);
-       ret = (tdm_mutex_locked == 1);
-       pthread_mutex_unlock(&tdm_mutex_check_lock);
-       return ret;
-}
-
-#define tdm_display_lock(dpy)   _pthread_mutex_lock(&((tdm_private_display *)dpy)->lock)
-#define tdm_display_unlock(dpy)   _pthread_mutex_unlock(&((tdm_private_display *)dpy)->lock)
-
 tdm_error
-tdm_display_update_output(tdm_private_display *private_display,
-                                                 tdm_output *output_backend, int pipe);
+tdm_display_update_output(tdm_private_module *private_module, tdm_output *output_backend);
+void
+tdm_display_destroy_private_output(tdm_private_output *private_output);
+
 tdm_error
 tdm_display_enable_debug_module(const char*modules);
 tdm_error
 tdm_display_enable_dump(tdm_private_display *private_display, const char *dump_str, char *reply, int *len);
 tdm_error
-tdm_display_enable_path(const char *path);
-tdm_error
-tdm_display_enable_ttrace_vblank(tdm_display *dpy, tdm_output *output, int enable);
-tdm_error
-tdm_display_enable_commit_per_vblank(tdm_private_display *private_display, int enable);
+tdm_display_enable_ttrace(tdm_private_display *private_display, const char *ttrace, int output_id, char *reply, int *len);
 tdm_error
 tdm_display_enable_fps(tdm_private_display *private_display, int enable);
 
 void
+tdm_config_deinit(void);
+
+void
 tdm_monitor_server_command(tdm_display *dpy, const char *options, char *reply, int *len);
 
+/* virtual */
+tdm_voutput *
+tdm_display_voutput_create(tdm_display *dpy, const char *name, tdm_error *error);
+tdm_error
+tdm_voutput_destroy(tdm_voutput *voutput);
+tdm_error
+tdm_voutput_set_available_mode(tdm_voutput *voutput, const tdm_output_mode *modes, int count);
+tdm_error
+tdm_voutput_set_physical_size(tdm_voutput *voutput, unsigned int mmwidth, unsigned int mmheight);
+tdm_error
+tdm_voutput_connect(tdm_voutput *voutput);
+tdm_error
+tdm_voutput_disconnect(tdm_voutput *voutput);
+tdm_error
+tdm_voutput_set_commit_func(tdm_voutput *voutput, tdm_voutput_commit_handler func);
+tdm_error
+tdm_voutput_attach_buffer(tdm_voutput *voutput, tbm_surface_h buffer);
+tdm_error
+tdm_voutput_commit_buffer(tdm_voutput *voutput);
+tdm_error
+tdm_output_set_voutput_commit(tdm_voutput *voutput);
+tdm_error
+tdm_output_unset_voutput_commit(tdm_voutput *voutput);
+tdm_error
+tdm_voutput_commit_done(tdm_voutput *voutput);
+void *
+tdm_display_find_private_voutput(tdm_private_display *private_display, double stamp);
 #ifdef __cplusplus
 }
 #endif