#include <sys/types.h>
#include <math.h>
+#include <wayland-server-protocol.h>
#include <tbm_bufmgr.h>
#include <tbm_surface_queue.h>
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;
#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_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_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_commit_handler tdm_private_commit_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;
/* 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;
- unsigned long stamp;
+ double stamp;
tdm_private_display *private_display;
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 commit_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;
tdm_caps_layer caps;
tdm_layer *layer_backend;
- tbm_surface_h pending_buffer;
- tbm_surface_h waiting_buffer;
- tbm_surface_h showing_buffer;
+ /* 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;
- unsigned long stamp;
+ double stamp;
tdm_private_display *private_display;
struct list_head link;
struct list_head display_link;
- unsigned long stamp;
+ double stamp;
tdm_capture_target target;
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_commit_handler {
+struct _tdm_private_output_commit_handler {
struct list_head link;
tdm_private_output *private_output;
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;
pid_t owner_tid;
};
+struct _tdm_private_layer_buffer {
+ tbm_surface_h buffer;
+ struct list_head link;
+};
+
typedef struct _tdm_buffer_info {
tbm_surface_h buffer;
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);
tdm_private_output *
-tdm_display_find_output_stamp(tdm_private_display *private_display,
- unsigned long stamp);
+tdm_display_find_output_stamp(tdm_private_display *private_display, double stamp);
tdm_private_pp *
-tdm_pp_find_stamp(tdm_private_display *private_display, unsigned long stamp);
+tdm_pp_find_stamp(tdm_private_display *private_display, double stamp);
tdm_private_capture *
-tdm_capture_find_stamp(tdm_private_display *private_display, unsigned long stamp);
+tdm_capture_find_stamp(tdm_private_display *private_display, double stamp);
void
tdm_output_cb_vblank(tdm_output *output_backend, unsigned int sequence,
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);
+tdm_error
+tdm_output_wait_vblank_add_front(tdm_output *output, int interval, int sync,
+ tdm_output_vblank_handler func, void *user_data);
+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);
+
+void
+tdm_output_remove_vblank_handler_internal(tdm_output *output, tdm_output_vblank_handler func, void *user_data);
+void
+tdm_output_remove_commit_handler_internal(tdm_output *output, tdm_output_commit_handler func, void *user_data);
+void
+tdm_layer_remove_commit_handler_internal(tdm_layer *layer, tdm_layer_commit_handler func, void *user_data);
+
+void
+tdm_layer_committed(tdm_private_layer *private_layer, tdm_private_layer_buffer **committed_buffer);
+
+void
tdm_pp_cb_done(tdm_pp *pp_backend, tbm_surface_h src, tbm_surface_h dst,
void *user_data);
void
tdm_capture_cb_done(tdm_capture *capture_backend, tbm_surface_h buffer,
void *user_data);
+tdm_error
+tdm_vblank_cb_vblank_SW(tdm_vblank *vblank, double vblank_stamp);
+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);
+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,
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;
struct _tdm_thread_cb_output_vblank {
tdm_thread_cb_base base;
- unsigned long output_stamp;
+ double output_stamp;
unsigned int sequence;
unsigned int tv_sec;
unsigned int tv_usec;
struct _tdm_thread_cb_output_status {
tdm_thread_cb_base base;
- unsigned long output_stamp;
+ 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;
- unsigned long pp_stamp;
+ 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;
- unsigned long capture_stamp;
+ 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
void
tdm_server_deinit(tdm_private_loop *private_loop);
+char *
+tdm_helper_dump_make_directory(const char *path, char *reply, int *len);
void
-tdm_helper_dump_buffer_str(tbm_surface_h buffer, const char *str);
-unsigned long
-tdm_helper_get_time_in_millis(void);
-unsigned long
-tdm_helper_get_time_in_micros(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 { \
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)
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)
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
tdm_error
tdm_display_enable_debug_module(const char*modules);
tdm_error
-tdm_display_enable_dump(const char *dump_str);
+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);
-
-/**
- * @brief The tdm vblank object
- */
-typedef void tdm_vblank;
-
-typedef void (*tdm_vblank_handler)(tdm_vblank *vblank, tdm_error error, unsigned int sequence,
- unsigned int tv_sec, unsigned int tv_usec, void *user_data);
-
-tdm_vblank*
-tdm_vblank_create(tdm_display *dpy, tdm_output *output, tdm_error *error);
-void
-tdm_vblank_destroy(tdm_vblank *vblank);
-tdm_error
-tdm_vblank_set_fps(tdm_vblank *vblank, unsigned int fps);
tdm_error
-tdm_vblank_set_offset(tdm_vblank *vblank, int offset);
+tdm_display_enable_ttrace_vblank(tdm_display *dpy, tdm_output *output, int enable);
tdm_error
-tdm_vblank_set_enable_fake(tdm_vblank *vblank, unsigned int enable_fake);
+tdm_display_enable_commit_per_vblank(tdm_private_display *private_display, int enable);
tdm_error
-tdm_vblank_wait(tdm_vblank *vblank, unsigned int req_sec, unsigned int req_usec, unsigned int interval, tdm_vblank_handler func, void *user_data);
+tdm_display_enable_fps(tdm_private_display *private_display, int enable);
void
-tdm_dbg_server_command(tdm_display *dpy, const char *options, char *reply, int *len);
+tdm_monitor_server_command(tdm_display *dpy, const char *options, char *reply, int *len);
#ifdef __cplusplus
}