X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Ftdm_vblank.c;h=4bfa5560007806536220b82502e8aeaecc683803;hb=2adc0c96b4af5f88b3560e8ebd0b595a3f483578;hp=abba41482f6544fa353a00f2ef6e1ed4e3d16d0f;hpb=7fe9c76c28843a1b88057ced0e99cf33146feaad;p=platform%2Fcore%2Fuifw%2Flibtdm.git

diff --git a/src/tdm_vblank.c b/src/tdm_vblank.c
index abba414..4bfa556 100644
--- a/src/tdm_vblank.c
+++ b/src/tdm_vblank.c
@@ -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
@@ -37,10 +37,7 @@
 #include "config.h"
 #endif
 
-#include "tdm.h"
 #include "tdm_private.h"
-#include "tdm_list.h"
-#include "tdm_macro.h"
 
 /* CAUTION:
  * Basically tdm vblank doesn't care about thread things.
@@ -129,6 +126,9 @@ typedef struct _tdm_private_vblank {
 	/* for SW */
 	tdm_event_loop_source *SW_timer;
 	struct list_head SW_wait_list;
+
+	/* for timeout */
+	tdm_event_loop_source *timeout_timer;
 } tdm_private_vblank;
 
 struct _tdm_vblank_wait_info {
@@ -139,6 +139,7 @@ struct _tdm_vblank_wait_info {
 
 	double req_time;
 	unsigned int interval;
+	int hw_interval;
 
 	tdm_vblank_handler func;
 	void *user_data;
@@ -157,10 +158,10 @@ typedef struct _tdm_vblank_create_handler_info {
 	void *user_data;
 } tdm_vblank_create_handler_info;
 
-/* valid_vblank_list and valid_wait_list should be protected by valid_list_lock because
- * tdm_vblank can be used in multi-thread.
+/* valid_vblank_list, valid_wait_list and create_handler_list should be protected
+ * by valid_list_lock because tdm_vblank can be used in multi-thread.
  */
-static pthread_mutex_t valid_list_lock;
+static pthread_mutex_t valid_list_lock = PTHREAD_MUTEX_INITIALIZER;
 static struct list_head valid_vblank_list;
 static struct list_head valid_wait_list;
 static struct list_head create_handler_list;
@@ -168,22 +169,37 @@ static unsigned int vblank_list_inited;
 static unsigned int vblank_global_fps;
 static double stamp = 0;
 
-static tdm_error _tdm_vblank_cb_vblank_SW(void *user_data);
+static void _tdm_vblank_cb_vblank_SW(tdm_private_display *private_display, void *object, tdm_thread_cb_base *cb_base, void *user_data);
+static tdm_error _tdm_vblank_cb_timeout_SW(void *user_data);
 static tdm_error _tdm_vblank_wait_SW(tdm_vblank_wait_info *wait_info);
 static void _tdm_vblank_cb_vblank_HW(tdm_output *output, unsigned int sequence,
 									 unsigned int tv_sec, unsigned int tv_usec,
 									 void *user_data);
+static void _tdm_vblank_timeout_timer_update(tdm_private_vblank *private_vblank, int ms_delay);
+static void _tdm_vblank_get_client_information(tdm_private_vblank *private_vblank,
+											   pid_t *pid, const char **name);
 
 #if 0
 static void
-_print_list(struct list_head *list)
+_print_list(tdm_private_vblank *private_vblank)
 {
 	tdm_vblank_wait_info *w = NULL;
+	int count = 0;
 
-	LIST_FOR_EACH_ENTRY(w, list, link) {
-		printf(" %d", w->interval);
+	LIST_FOR_EACH_ENTRY(w, &private_vblank->HW_wait_list, link) {
+		VIN("HW_wait(%p): type(%d) req_time(%.6f) target_time(%.6f) target_seq(%u)",
+			w, w->type, w->req_time, w->target_time, w->target_seq);
+		count++;
 	}
-	printf("\n");
+
+	LIST_FOR_EACH_ENTRY(w, &private_vblank->SW_wait_list, link) {
+		VIN("SW_wait(%p): type(%d) req_time(%.6f) target_time(%.6f) target_seq(%u)",
+			w, w->type, w->req_time, w->target_time, w->target_seq);
+		count++;
+	}
+
+	if (!count)
+		VIN("NO_wait");
 }
 #endif
 
@@ -222,14 +238,11 @@ _tdm_vblank_valid_list_del(struct list_head *valid_link)
 	pthread_mutex_unlock(&valid_list_lock);
 }
 
-static inline tdm_private_vblank*
-_tdm_vblank_find(double vblank_stamp)
+static inline void*
+_tdm_vblank_find_object(tdm_private_display *private_display, double vblank_stamp)
 {
 	tdm_private_vblank *v = NULL;
 
-	if (!vblank_stamp)
-		return 0;
-
 	pthread_mutex_lock(&valid_list_lock);
 	LIST_FOR_EACH_ENTRY(v, &valid_vblank_list, valid_link) {
 		if (v->stamp == vblank_stamp) {
@@ -239,7 +252,7 @@ _tdm_vblank_find(double vblank_stamp)
 	}
 	pthread_mutex_unlock(&valid_list_lock);
 
-	return 0;
+	return NULL;
 }
 
 static inline unsigned int
@@ -333,6 +346,13 @@ _tdm_vblank_free_HW_wait(tdm_private_vblank *private_vblank, tdm_error error, un
 {
 	tdm_vblank_wait_info *w = NULL, *ww = NULL;
 
+	if (!LIST_IS_EMPTY(&private_vblank->HW_wait_list)) {
+		pid_t pid;
+		const char *proc_name;
+		_tdm_vblank_get_client_information(private_vblank, &pid, &proc_name);
+		VWR("TDM HW vblank destroyed forcely!! (pid: %u, name: %s)", pid, proc_name);
+	}
+
 	LIST_FOR_EACH_ENTRY_SAFE(w, ww, &private_vblank->HW_wait_list, link) {
 		LIST_DEL(&w->link);
 		_tdm_vblank_valid_list_del(&w->valid_link);
@@ -342,7 +362,7 @@ _tdm_vblank_free_HW_wait(tdm_private_vblank *private_vblank, tdm_error error, un
 		tdm_display_unlock(private_vblank->dpy);
 
 		VDB("wait(%p) last(%.6f) sequence(%u) done (error:%d, call_cb:%u)",
-			w, 0, w->target_seq, error, call_cb);
+			w, (double)0.0, w->target_seq, error, call_cb);
 
 		if (call_cb && w->func)
 			w->func(private_vblank, error, 0, 0, 0, w->user_data);
@@ -356,25 +376,18 @@ _tdm_vblank_update_output_info(tdm_private_vblank *private_vblank)
 {
 	tdm_output *output = private_vblank->output;
 	tdm_output_conn_status connection = TDM_OUTPUT_CONN_STATUS_DISCONNECTED;
-	unsigned int vrefresh = 0;
+	unsigned int vrefresh = TDM_VBLANK_DEFAULT_VREFRESH;
+	const tdm_output_mode *mode = NULL;
 	tdm_error ret;
 
 	ret = tdm_output_get_conn_status(output, &connection);
 	TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
 
-	if (connection != TDM_OUTPUT_CONN_STATUS_DISCONNECTED) {
-		const tdm_output_mode *mode = NULL;
-		tdm_output_get_mode(output, &mode);
-		if (mode)
-			vrefresh = mode->vrefresh;
-		else
-			VWR("mode not setted!!!");
-	}
-
-	if (vrefresh == 0) {
-		VWR("vrefresh can't be zero !!!");
-		vrefresh = TDM_VBLANK_DEFAULT_VREFRESH;
-	}
+	ret = tdm_output_get_mode(output, &mode);
+	if (ret == TDM_ERROR_NONE && mode)
+		vrefresh = mode->vrefresh;
+	else
+		VWR("mode not setted!!!");
 
 	private_vblank->connection = connection;
 	private_vblank->vrefresh = vrefresh;
@@ -404,8 +417,13 @@ _tdm_vblank_cb_output_change(tdm_output *output, tdm_output_change_type type,
 		if (TDM_OUTPUT_DPMS_VSYNC_IS_OFF(value.u32)) {
 			if (private_vblank->enable_fake)
 				_tdm_vblank_change_to_SW(private_vblank);
-			else
+			else {
+				tdm_display_lock(private_vblank->dpy);
+				_tdm_vblank_timeout_timer_update(private_vblank, 0);
+				tdm_display_unlock(private_vblank->dpy);
+
 				_tdm_vblank_free_HW_wait(private_vblank, TDM_ERROR_DPMS_OFF, 1);
+			}
 		}
 		break;
 	case TDM_OUTPUT_CHANGE_CONNECTION:
@@ -417,8 +435,13 @@ _tdm_vblank_cb_output_change(tdm_output *output, tdm_output_change_type type,
 		if (private_vblank->connection == TDM_OUTPUT_CONN_STATUS_DISCONNECTED) {
 			if (private_vblank->enable_fake)
 				_tdm_vblank_change_to_SW(private_vblank);
-			else
+			else {
+				tdm_display_lock(private_vblank->dpy);
+				_tdm_vblank_timeout_timer_update(private_vblank, 0);
+				tdm_display_unlock(private_vblank->dpy);
+
 				_tdm_vblank_free_HW_wait(private_vblank, TDM_ERROR_OUTPUT_DISCONNECTED, 1);
+			}
 		}
 		break;
 	default:
@@ -431,6 +454,7 @@ EXTERN tdm_error
 tdm_vblank_set_client_vblank_fps(unsigned int pid, const char *name, unsigned int fps)
 {
 	tdm_private_vblank *v = NULL;
+	tdm_error ret = TDM_ERROR_NONE;
 
 	TDM_RETURN_VAL_IF_FAIL(pid > 0, TDM_ERROR_INVALID_PARAMETER);
 	TDM_RETURN_VAL_IF_FAIL(fps > 0, TDM_ERROR_INVALID_PARAMETER);
@@ -459,9 +483,54 @@ tdm_vblank_set_client_vblank_fps(unsigned int pid, const char *name, unsigned in
 				continue;
 		}
 
-		tdm_vblank_set_fps(v, fps);
+		ret = tdm_vblank_set_fps(v, fps);
+		if (ret == TDM_ERROR_NONE)
+			TDM_INFO("(pid:%u) '%s' fps changed: %d", pid, v->name, fps);
+		else
+			TDM_ERR("(pid:%u) '%s' fps changing failed: %d", pid, v->name, fps);
+	}
+	pthread_mutex_unlock(&valid_list_lock);
+
+	return TDM_ERROR_NONE;
+}
+
+EXTERN tdm_error
+tdm_vblank_set_client_ignore_global_fps(unsigned int pid, const char *name, unsigned int ignore)
+{
+	tdm_private_vblank *v = NULL;
+	tdm_error ret = TDM_ERROR_NONE;
 
-		TDM_INFO("(pid:%u) '%s' fps changed: %d", pid, v->name, fps);
+	TDM_RETURN_VAL_IF_FAIL(pid > 0, TDM_ERROR_INVALID_PARAMETER);
+
+	TDM_INFO("pid: %u, name: %s, ignore: %u", pid, name, ignore);
+
+	pthread_mutex_lock(&valid_list_lock);
+	LIST_FOR_EACH_ENTRY(v, &valid_vblank_list, valid_link) {
+		struct wl_client *client;
+		pid_t client_pid = 0;
+
+		if (!v->resource)
+			continue;
+
+		client = wl_resource_get_client(v->resource);
+		if (!client)
+			continue;
+
+		wl_client_get_credentials(client, &client_pid, NULL, NULL);
+
+		if (client_pid != pid)
+			continue;
+
+		if (name && strncmp(name, TDM_VBLANK_DEFAULT_NAME, TDM_NAME_LEN)) {
+			if (strncmp(v->name, name, TDM_NAME_LEN))
+				continue;
+		}
+
+		ret = tdm_vblank_ignore_global_fps(v, ignore);
+		if (ret == TDM_ERROR_NONE)
+			TDM_INFO("(pid:%u) '%s' ignore changed: %u", pid, v->name, ignore);
+		else
+			TDM_ERR("(pid:%u) '%s' ignore changing failed: %u", pid, v->name, ignore);
 	}
 	pthread_mutex_unlock(&valid_list_lock);
 
@@ -494,44 +563,46 @@ tdm_vblank_enable_global_fps(unsigned int enable, unsigned int fps)
 	return TDM_ERROR_NONE;
 }
 
-INTERN tdm_error
-tdm_vblank_cb_vblank_create(tdm_vblank *vblank, double vblank_stamp)
+static void
+_tdm_vblank_thread_cb_create(tdm_private_display *private_display, void *object, tdm_thread_cb_base *cb_base, void *user_data)
 {
+	tdm_thread_cb_vblank_create *vblank_create = (tdm_thread_cb_vblank_create *)cb_base;
+	tdm_vblank_create_handler_info *ch_info = user_data;
 	tdm_private_vblank *private_vblank;
-	tdm_vblank_create_handler_info *ch_info = NULL, *hh = NULL;
 
-	TDM_RETURN_VAL_IF_FAIL(vblank || vblank_stamp > 0, TDM_ERROR_INVALID_PARAMETER);
+	TDM_RETURN_IF_FAIL(TDM_MUTEX_IS_LOCKED());
 
-	if (vblank)
-		private_vblank = vblank;
-	else {
-		private_vblank = _tdm_vblank_find(vblank_stamp);
-		if (!private_vblank) {
-			TDM_DBG("can't find vblank(%.0f) from valid_list", vblank_stamp);
-			return TDM_ERROR_NONE;
-		}
-	}
+	assert(ch_info != NULL);
 
-	if (!tdm_thread_in_display_thread(syscall(SYS_gettid))) {
-		tdm_thread_cb_vblank_create vblank_create;
-		tdm_private_display *private_display = private_vblank->dpy;
-		tdm_error ret;
+	private_vblank = _tdm_vblank_find_object(private_display, vblank_create->vblank_stamp);
+	if (!private_vblank) {
+		TDM_DBG("can't find vblank(%.0f) from valid_list", vblank_create->vblank_stamp);
+		return;
+	}
 
-		vblank_create.base.type = TDM_THREAD_CB_VBLANK_CREATE;
-		vblank_create.base.length = sizeof vblank_create;
-		vblank_create.vblank_stamp = private_vblank->stamp;
+	private_vblank->in_create_handler = 1;
+	tdm_display_unlock(private_display);
+	ch_info->func(private_vblank, ch_info->user_data);
+	tdm_display_lock(private_display);
+	private_vblank->in_create_handler = 0;
+}
 
-		ret = tdm_thread_send_cb(private_display->private_loop, &vblank_create.base);
-		TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
+static tdm_error
+_tdm_vblank_call_thread_cb(tdm_private_vblank *private_vblank)
+{
+	tdm_thread_cb_vblank_create vblank_create;
+	tdm_error ret;
 
-		return TDM_ERROR_NONE;
-	}
+	memset(&vblank_create, 0, sizeof vblank_create);
+	vblank_create.base.type = TDM_THREAD_CB_VBLANK_CREATE;
+	vblank_create.base.length = sizeof vblank_create;
+	vblank_create.base.object_stamp = 1;
+	vblank_create.base.data = NULL;
+	vblank_create.base.sync = 0;
+	vblank_create.vblank_stamp = private_vblank->stamp;
 
-	LIST_FOR_EACH_ENTRY_SAFE(ch_info, hh, &create_handler_list, link) {
-		private_vblank->in_create_handler = 1;
-		ch_info->func(private_vblank, ch_info->user_data);
-		private_vblank->in_create_handler = 0;
-	}
+	ret = tdm_thread_cb_call(private_vblank->dpy, &vblank_create.base, 1);
+	TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
 
 	return TDM_ERROR_NONE;
 }
@@ -539,27 +610,47 @@ tdm_vblank_cb_vblank_create(tdm_vblank *vblank, double vblank_stamp)
 EXTERN tdm_error
 tdm_vblank_add_create_handler(tdm_display *dpy, tdm_vblank_create_handler func, void *user_data)
 {
-	tdm_vblank_create_handler_info *ch_info;
+	tdm_vblank_create_handler_info *ch_info = NULL;
+	tdm_error ret;
 
+	TDM_RETURN_VAL_IF_FAIL(dpy != NULL, TDM_ERROR_INVALID_PARAMETER);
 	TDM_RETURN_VAL_IF_FAIL(func != NULL, TDM_ERROR_INVALID_PARAMETER);
 
-	/* we don't allow adding a create handler in sub-thread because tdm_vblank_create()
-	 * can be called in both threads and tdm_thread_send_cb supports only one-way
-	 * communication now.
-	 */
-	if (!tdm_thread_in_display_thread(syscall(SYS_gettid))) {
-		TDM_ERR("add_create_handler should be called in main thread");
-		return TDM_ERROR_BAD_REQUEST;
+	pthread_mutex_lock(&valid_list_lock);
+
+	LIST_FOR_EACH_ENTRY(ch_info, &create_handler_list, link) {
+		if (ch_info->func == func && ch_info->user_data == user_data) {
+			TDM_ERR("can't be added twice");
+			pthread_mutex_unlock(&valid_list_lock);
+			return TDM_ERROR_BAD_REQUEST;
+		}
 	}
 
 	ch_info = calloc(1, sizeof *ch_info);
-	TDM_RETURN_VAL_IF_FAIL(ch_info != NULL, TDM_ERROR_OUT_OF_MEMORY);
+	if (!ch_info) {
+		TDM_ERR("alloc failed: %m");
+		pthread_mutex_unlock(&valid_list_lock);
+		return TDM_ERROR_OUT_OF_MEMORY;
+	}
+
+	tdm_display_lock(dpy);
+	ret = tdm_thread_cb_add(dpy, TDM_THREAD_CB_VBLANK_CREATE, NULL, _tdm_vblank_thread_cb_create, ch_info);
+	tdm_display_unlock(dpy);
+
+	if (ret != TDM_ERROR_NONE) {
+		TDM_ERR("tdm_thread_cb_add failed");
+		free(ch_info);
+		pthread_mutex_unlock(&valid_list_lock);
+		return ret;
+	}
 
 	ch_info->func = func;
 	ch_info->user_data = user_data;
 
 	LIST_ADDTAIL(&ch_info->link, &create_handler_list);
 
+	pthread_mutex_unlock(&valid_list_lock);
+
 	return TDM_ERROR_NONE;
 }
 
@@ -568,23 +659,31 @@ tdm_vblank_remove_create_handler(tdm_display *dpy, tdm_vblank_create_handler fun
 {
 	tdm_vblank_create_handler_info *ch_info = NULL, *hh = NULL;
 
-	/* we don't allow adding a create handler in sub-thread because tdm_vblank_create()
-	 * can be called in both threads and tdm_thread_send_cb supports only one-way
-	 * communication now.
-	 */
-	if (!tdm_thread_in_display_thread(syscall(SYS_gettid))) {
-		TDM_ERR("remove_create_handler should be called in main thread");
-		return;
-	}
+	TDM_RETURN_IF_FAIL(dpy != NULL);
+	TDM_RETURN_IF_FAIL(func != NULL);
 
+	tdm_display_lock(dpy);
+	pthread_mutex_lock(&valid_list_lock);
 	LIST_FOR_EACH_ENTRY_SAFE(ch_info, hh, &create_handler_list, link) {
-		if (ch_info->func != func && ch_info->user_data != user_data)
+		if (ch_info->func != func || ch_info->user_data != user_data)
 			continue;
 
+		tdm_thread_cb_remove(dpy, TDM_THREAD_CB_VBLANK_CREATE, NULL, _tdm_vblank_thread_cb_create, ch_info);
+
 		LIST_DEL(&ch_info->link);
 		free(ch_info);
+		pthread_mutex_unlock(&valid_list_lock);
+		tdm_display_unlock(dpy);
 		return;
 	}
+	pthread_mutex_unlock(&valid_list_lock);
+	tdm_display_unlock(dpy);
+}
+
+static void*
+_tdm_vblank_find_display(tdm_private_display *private_display, double stamp)
+{
+	return private_display;
 }
 
 INTERN tdm_error
@@ -593,15 +692,13 @@ tdm_vblank_init(tdm_display *dpy)
 	if (vblank_list_inited)
 		return TDM_ERROR_NONE;
 
-	if (pthread_mutex_init(&valid_list_lock, NULL)) {
-		TDM_ERR("mutex init failed: %m");
-		return TDM_ERROR_OUT_OF_MEMORY;
-	}
-
 	LIST_INITHEAD(&valid_vblank_list);
 	LIST_INITHEAD(&valid_wait_list);
 	LIST_INITHEAD(&create_handler_list);
 
+	tdm_thread_cb_set_find_func(TDM_THREAD_CB_VBLANK_SW, _tdm_vblank_find_object);
+	tdm_thread_cb_set_find_func(TDM_THREAD_CB_VBLANK_CREATE, _tdm_vblank_find_display);
+
 	vblank_list_inited = 1;
 
 	return TDM_ERROR_NONE;
@@ -626,8 +723,6 @@ tdm_vblank_deinit(tdm_display *dpy)
 		free(ch_info);
 	}
 
-	pthread_mutex_destroy(&valid_list_lock);
-
 	vblank_list_inited = 0;
 }
 
@@ -648,12 +743,19 @@ tdm_vblank_create(tdm_display *dpy, tdm_output *output, tdm_error *error)
 		/* LCOV_EXCL_START */
 		if (error)
 			*error = TDM_ERROR_OUT_OF_MEMORY;
-		VER("alloc failed");
+		TDM_ERR("alloc failed");
 		return NULL;
 		/* LCOV_EXCL_STOP */
 	}
 
-	tdm_output_add_change_handler(output, _tdm_vblank_cb_output_change, private_vblank);
+	ret = tdm_output_add_change_handler(output, _tdm_vblank_cb_output_change, private_vblank);
+	if (ret != TDM_ERROR_NONE) {
+		free(private_vblank);
+		if (error)
+			*error = TDM_ERROR_OPERATION_FAILED;
+		TDM_ERR("tdm_output_add_change_handler failed");
+		return NULL;
+	}
 
 	private_vblank->stamp = ++stamp;
 	private_vblank->owner_tid = syscall(SYS_gettid);
@@ -677,7 +779,7 @@ tdm_vblank_create(tdm_display *dpy, tdm_output *output, tdm_error *error)
 		private_vblank->vrefresh, private_vblank->connection);
 
 	tdm_display_lock(private_vblank->dpy);
-	tdm_vblank_cb_vblank_create(NULL, private_vblank->stamp);
+	_tdm_vblank_call_thread_cb(private_vblank);
 	tdm_display_unlock(private_vblank->dpy);
 
 	return (tdm_vblank *)private_vblank;
@@ -700,6 +802,7 @@ tdm_vblank_destroy(tdm_vblank *vblank)
 
 	if (private_vblank->SW_timer) {
 		tdm_display_lock(private_vblank->dpy);
+		tdm_thread_cb_remove(private_vblank, TDM_THREAD_CB_VBLANK_SW, NULL, _tdm_vblank_cb_vblank_SW, NULL);
 		tdm_event_loop_source_remove(private_vblank->SW_timer);
 		tdm_display_unlock(private_vblank->dpy);
 	}
@@ -709,17 +812,44 @@ tdm_vblank_destroy(tdm_vblank *vblank)
 
 	_tdm_vblank_free_HW_wait(private_vblank, 0, 0);
 
+	if (!LIST_IS_EMPTY(&private_vblank->SW_wait_list)) {
+		pid_t pid;
+		const char *proc_name;
+		_tdm_vblank_get_client_information(private_vblank, &pid, &proc_name);
+		VER("TDM SW vblank destroyed forcely!! (pid: %u, name: %s)", pid, proc_name);
+	}
+
 	LIST_FOR_EACH_ENTRY_SAFE(w, ww, &private_vblank->SW_wait_list, link) {
 		LIST_DEL(&w->link);
 		_tdm_vblank_valid_list_del(&w->valid_link);
 		free(w);
 	}
 
+	if (private_vblank->timeout_timer) {
+		tdm_display_lock(private_vblank->dpy);
+		tdm_event_loop_source_remove(private_vblank->timeout_timer);
+		tdm_display_unlock(private_vblank->dpy);
+	}
+
 	VIN("destroyed");
 
 	free(private_vblank);
 }
 
+EXTERN tdm_output *
+tdm_vblank_get_output(tdm_vblank *vblank, tdm_error *error)
+{
+	tdm_private_vblank *private_vblank = vblank;
+	tdm_error ret = TDM_ERROR_NONE;
+
+	TDM_RETURN_VAL_IF_FAIL_WITH_ERROR(tdm_vblank_is_valid(vblank), TDM_ERROR_INVALID_PARAMETER, NULL);
+
+	if (error)
+		*error = TDM_ERROR_NONE;
+
+	return private_vblank->output;
+}
+
 EXTERN tdm_error
 tdm_vblank_get_client_pid(tdm_vblank *vblank, pid_t *pid)
 {
@@ -785,7 +915,7 @@ tdm_vblank_set_fps(tdm_vblank *vblank, unsigned int fps)
 	TDM_RETURN_VAL_IF_FAIL(fps > 0, TDM_ERROR_INVALID_PARAMETER);
 
 	if (private_vblank->fps_fixed) {
-		VIN("fps(%d) can't be changed", private_vblank->fps);
+		VIN("fps(%u) can't be changed", private_vblank->fps);
 		return TDM_ERROR_NONE;
 	}
 
@@ -797,7 +927,7 @@ tdm_vblank_set_fps(tdm_vblank *vblank, unsigned int fps)
 	private_vblank->fps = fps;
 	private_vblank->check_HW_or_SW = 1;
 
-	VIN("fps(%d) changed", fps);
+	VIN("fps(%u) changed", fps);
 
 	return TDM_ERROR_NONE;
 }
@@ -832,7 +962,7 @@ tdm_vblank_set_fixed_fps(tdm_vblank *vblank, unsigned int fps)
 	private_vblank->fps = fps;
 	private_vblank->check_HW_or_SW = 1;
 
-	VIN("fps(%d) fixed", fps);
+	VIN("fps(%u) fixed", fps);
 
 	return TDM_ERROR_NONE;
 }
@@ -850,7 +980,7 @@ tdm_vblank_ignore_global_fps(tdm_vblank *vblank, unsigned int ignore)
 	private_vblank->ignore_global_fps = ignore;
 	private_vblank->check_HW_or_SW = 1;
 
-	VIN("ignore_global_fps(%d)", private_vblank->ignore_global_fps);
+	VIN("ignore_global_fps(%u)", private_vblank->ignore_global_fps);
 
 	return TDM_ERROR_NONE;
 }
@@ -861,6 +991,7 @@ tdm_vblank_set_offset(tdm_vblank *vblank, int offset)
 	tdm_private_vblank *private_vblank = vblank;
 
 	TDM_RETURN_VAL_IF_FAIL(tdm_vblank_is_valid(vblank), TDM_ERROR_INVALID_PARAMETER);
+	TDM_RETURN_VAL_IF_FAIL(offset >= 0, TDM_ERROR_INVALID_PARAMETER);
 
 	if (private_vblank->offset == offset)
 		return TDM_ERROR_NONE;
@@ -868,7 +999,7 @@ tdm_vblank_set_offset(tdm_vblank *vblank, int offset)
 	private_vblank->offset = offset;
 	private_vblank->check_HW_or_SW = 1;
 
-	VIN("offset(%d)", private_vblank->offset);
+	VIN("offset(%u)", private_vblank->offset);
 
 	return TDM_ERROR_NONE;
 }
@@ -898,7 +1029,7 @@ tdm_vblank_set_enable_fake(tdm_vblank *vblank, unsigned int enable_fake)
 
 	private_vblank->enable_fake = enable_fake;
 
-	VIN("enable_fake(%d)", private_vblank->enable_fake);
+	VIN("enable_fake(%u)", private_vblank->enable_fake);
 
 	return TDM_ERROR_NONE;
 }
@@ -917,6 +1048,65 @@ tdm_vblank_get_enable_fake(tdm_vblank *vblank, unsigned int *enable_fake)
 }
 
 static tdm_error
+_tdm_vblank_timeout_timer_cb(void *user_data)
+{
+	tdm_private_vblank *private_vblank = user_data;
+	tdm_vblank_wait_info *w = NULL;
+	pid_t pid;
+	const char *proc_name;
+
+	TDM_RETURN_VAL_IF_FAIL(private_vblank != NULL, TDM_ERROR_OPERATION_FAILED);
+
+	_tdm_vblank_get_client_information(private_vblank, &pid, &proc_name);
+
+	VER("TDM vblank TIMEOUT!! (pid: %u, name: %s)", pid, proc_name);
+	VER("quotient(%u) last_seq(%u) last_time(%.6f)", private_vblank->quotient, private_vblank->last_seq, private_vblank->last_time);
+
+	LIST_FOR_EACH_ENTRY(w, &private_vblank->HW_wait_list, link) {
+		VER("wait_info(%p) req_time(%.6f) target_seq(%u) interval(%u) hw_interval(%d)",
+			w, w->req_time, w->target_seq, w->interval, w->hw_interval);
+		tdm_output_vblank_print_wait_information(private_vblank->output, w);
+	}
+
+	LIST_FOR_EACH_ENTRY(w, &private_vblank->SW_wait_list, link) {
+		VER("wait_info(%p) req_time(%.6f) target_time(%.6f) target_seq(%u) interval(%u)",
+			w, w->req_time, w->target_time, w->target_seq, w->interval);
+	}
+
+	return TDM_ERROR_NONE;
+}
+
+static void
+_tdm_vblank_timeout_timer_update(tdm_private_vblank *private_vblank, int ms_delay)
+{
+	tdm_error ret;
+
+	if (!private_vblank->timeout_timer) {
+		private_vblank->timeout_timer =
+			tdm_event_loop_add_timer_handler(private_vblank->dpy,
+											 _tdm_vblank_timeout_timer_cb,
+											 private_vblank,
+											 &ret);
+		if (!private_vblank->timeout_timer) {
+			VER("couldn't add timer");
+			return;
+		}
+		VIN("Create Timeout timer");
+	}
+
+	ret = tdm_event_loop_source_timer_update(private_vblank->timeout_timer, ms_delay);
+	if (ret != TDM_ERROR_NONE) {
+		VER("couldn't update timer");
+		return;
+	}
+
+	if (ms_delay != 0)
+		VDB("timeout timer updated");
+	else
+		VDB("timeout timer disabled");
+}
+
+static tdm_error
 _tdm_vblank_sw_timer_update(tdm_private_vblank *private_vblank)
 {
 	tdm_vblank_wait_info *first_wait_info = NULL;
@@ -952,7 +1142,7 @@ _tdm_vblank_sw_timer_update(tdm_private_vblank *private_vblank)
 	if (!private_vblank->SW_timer) {
 		private_vblank->SW_timer =
 			tdm_event_loop_add_timer_handler(private_vblank->dpy,
-											 _tdm_vblank_cb_vblank_SW,
+											 _tdm_vblank_cb_timeout_SW,
 											 private_vblank,
 											 &ret);
 		if (!private_vblank->SW_timer) {
@@ -960,6 +1150,16 @@ _tdm_vblank_sw_timer_update(tdm_private_vblank *private_vblank)
 			VER("couldn't add timer");
 			return ret;
 		}
+
+		ret = tdm_thread_cb_add(private_vblank, TDM_THREAD_CB_VBLANK_SW, NULL, _tdm_vblank_cb_vblank_SW, NULL);
+		if (ret != TDM_ERROR_NONE) {
+			tdm_event_loop_source_remove(private_vblank->SW_timer);
+			private_vblank->SW_timer = NULL;
+			tdm_display_unlock(private_vblank->dpy);
+			VER("couldn't add thread_cb");
+			return ret;
+		}
+
 		VIN("Create SW timer");
 	}
 
@@ -988,15 +1188,17 @@ _tdm_vblank_cb_vblank_HW(tdm_output *output, unsigned int sequence,
 	tdm_private_vblank *private_vblank;
 
 	if (!_tdm_vblank_check_valid_wait(wait_info)) {
-		TDM_DBG("can't find wait(%p) from valid_wait_list", wait_info);
+		TDM_ERR("can't find wait(%p) from valid_wait_list", wait_info);
 		return;
 	}
 
 	private_vblank = wait_info->private_vblank;
 	TDM_RETURN_IF_FAIL(tdm_vblank_is_valid(private_vblank));
 
+	assert(private_vblank->owner_tid == syscall(SYS_gettid));
+
 	if (!_tdm_vblank_find_wait(wait_info, &private_vblank->HW_wait_list)) {
-		VDB("can't find wait(%p)", wait_info);
+		VER("can't find wait(%p)", wait_info);
 		return;
 	}
 
@@ -1015,15 +1217,19 @@ _tdm_vblank_cb_vblank_HW(tdm_output *output, unsigned int sequence,
 
 		ret = _tdm_vblank_sw_timer_update(private_vblank);
 
-		/* wait_info will be freed in _tdm_vblank_cb_vblank_SW() */
+		/* wait_info will be freed in _tdm_vblank_cb_timeout_SW() */
 		if (ret == TDM_ERROR_NONE) {
-			VDB("wait(%p) SW timer", wait_info);
+			VIN("wait(%p) SW timer", wait_info);
 			return;
 		}
 
-		VWR("couldn't update sw timer");
+		VER("couldn't update sw timer");
 	}
 
+	tdm_display_lock(private_vblank->dpy);
+	_tdm_vblank_timeout_timer_update(private_vblank, 0);
+	tdm_display_unlock(private_vblank->dpy);
+
 	LIST_DEL(&wait_info->link);
 	_tdm_vblank_valid_list_del(&wait_info->valid_link);
 
@@ -1043,6 +1249,9 @@ _tdm_vblank_cb_vblank_HW(tdm_output *output, unsigned int sequence,
 
 	VDB("wait(%p) last(%.6f) sequence(%u) done", wait_info, private_vblank->last_time, wait_info->target_seq);
 
+	if (tdm_ttrace_module & TDM_TTRACE_VBLANK)
+		TDM_TRACE_ASYNC_END((int)wait_info->req_time, "TDM_Vblank:%u", (unsigned int)private_vblank->stamp);
+
 	if (wait_info->func)
 		wait_info->func(private_vblank, TDM_ERROR_NONE, wait_info->target_seq,
 						tv_sec, tv_usec, wait_info->user_data);
@@ -1064,9 +1273,9 @@ _tdm_vblank_wait_HW(tdm_vblank_wait_info *wait_info)
 
 	_tdm_vblank_insert_wait(wait_info, &private_vblank->HW_wait_list);
 
-	hw_interval = wait_info->interval * private_vblank->quotient;
-
 	if (private_vblank->last_time == 0) {
+		hw_interval = wait_info->interval * private_vblank->quotient;
+
 		/* SW vblank starts from now. SW vblank doesn't need to be aligned with HW vblank. */
 		private_vblank->last_seq = 0;
 		private_vblank->last_time = tdm_helper_get_time();
@@ -1111,6 +1320,10 @@ _tdm_vblank_wait_HW(tdm_vblank_wait_info *wait_info)
 	}
 
 	private_vblank->last_interval = hw_interval;
+	wait_info->hw_interval = hw_interval;
+
+	if (tdm_ttrace_module & TDM_TTRACE_VBLANK)
+		TDM_TRACE_ASYNC_BEGIN((int)wait_info->req_time, "TDM_Vblank:%u", (unsigned int)private_vblank->stamp);
 
 	if (private_vblank->add_front)
 		ret = tdm_output_wait_vblank_add_front(private_vblank->output, hw_interval, 0,
@@ -1129,56 +1342,28 @@ _tdm_vblank_wait_HW(tdm_vblank_wait_info *wait_info)
 	return TDM_ERROR_NONE;
 }
 
-static tdm_error
-_tdm_vblank_cb_vblank_SW(void *user_data)
-{
-	tdm_private_vblank *private_vblank = user_data;
-
-	TDM_RETURN_VAL_IF_FAIL(tdm_vblank_is_valid(private_vblank), TDM_ERROR_OPERATION_FAILED);
-
-	return tdm_vblank_cb_vblank_SW(private_vblank, 0);
-}
-
-INTERN tdm_error
-tdm_vblank_cb_vblank_SW(tdm_vblank *vblank, double vblank_stamp)
+static void
+_tdm_vblank_cb_vblank_SW(tdm_private_display *private_display, void *object, tdm_thread_cb_base *cb_base, void *user_data)
 {
-	tdm_private_vblank *private_vblank;
+	tdm_private_vblank *private_vblank = object;
 	tdm_vblank_wait_info *first_wait_info = NULL, *w = NULL, *ww = NULL;
 
-	TDM_RETURN_VAL_IF_FAIL(vblank || vblank_stamp > 0, TDM_ERROR_INVALID_PARAMETER);
+	TDM_RETURN_IF_FAIL(TDM_MUTEX_IS_LOCKED());
 
-	if (vblank)
-		private_vblank = vblank;
-	else {
-		private_vblank = _tdm_vblank_find(vblank_stamp);
-		if (!private_vblank) {
-			TDM_DBG("can't find vblank(%.0f) from valid_list", vblank_stamp);
-			return TDM_ERROR_NONE;
-		}
-	}
-
-	if (private_vblank->owner_tid != syscall(SYS_gettid)) {
-		tdm_thread_cb_vblank_sw vblank_sw;
-		tdm_private_display *private_display = private_vblank->dpy;
-		tdm_error ret;
-
-		vblank_sw.base.type = TDM_THREAD_CB_VBLANK_SW;
-		vblank_sw.base.length = sizeof vblank_sw;
-		vblank_sw.vblank_stamp = private_vblank->stamp;
-
-		ret = tdm_thread_send_cb(private_display->private_loop, &vblank_sw.base);
-		TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
-
-		return TDM_ERROR_NONE;
-	}
+	assert(private_vblank->owner_tid == syscall(SYS_gettid));
 
 	if (LIST_IS_EMPTY(&private_vblank->SW_wait_list)) {
 		VER("no wait_info");
-		return TDM_ERROR_OPERATION_FAILED;
+		return;
 	}
 
+	if (!LIST_IS_EMPTY(&private_vblank->HW_wait_list))
+		TDM_NEVER_GET_HERE();
+
 	first_wait_info = container_of(private_vblank->SW_wait_list.next, first_wait_info, link);
-	TDM_RETURN_VAL_IF_FAIL(first_wait_info != NULL, TDM_ERROR_OPERATION_FAILED);
+	TDM_RETURN_IF_FAIL(first_wait_info != NULL);
+
+	_tdm_vblank_timeout_timer_update(private_vblank, 0);
 
 	if (private_vblank->last_seq >= first_wait_info->target_seq)
 		TDM_ERR("last_seq(%u) target_seq(%u)", private_vblank->last_seq, first_wait_info->target_seq);
@@ -1205,6 +1390,28 @@ tdm_vblank_cb_vblank_SW(tdm_vblank *vblank, double vblank_stamp)
 
 		free(w);
 	}
+}
+
+static tdm_error
+_tdm_vblank_cb_timeout_SW(void *user_data)
+{
+	tdm_private_vblank *private_vblank = user_data;
+	tdm_thread_cb_vblank_sw vblank_sw;
+	tdm_error ret;
+
+	TDM_RETURN_VAL_IF_FAIL(tdm_vblank_is_valid(private_vblank), TDM_ERROR_OPERATION_FAILED);
+
+	VIN("timeout_SW -> thread-cb");
+
+	memset(&vblank_sw, 0, sizeof vblank_sw);
+	vblank_sw.base.type = TDM_THREAD_CB_VBLANK_SW;
+	vblank_sw.base.length = sizeof vblank_sw;
+	vblank_sw.base.object_stamp = private_vblank->stamp;
+	vblank_sw.base.data = NULL;
+	vblank_sw.base.sync = 0;
+
+	ret = tdm_thread_cb_call(private_vblank, &vblank_sw.base, 1);
+	TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
 
 	return TDM_ERROR_NONE;
 }
@@ -1214,52 +1421,53 @@ _tdm_vblank_wait_SW(tdm_vblank_wait_info *wait_info)
 {
 	tdm_private_vblank *private_vblank = wait_info->private_vblank;
 	tdm_error ret;
+	double last, prev, req, curr, target;
+	unsigned int skip;
 
 	if (private_vblank->last_type != VBLANK_EVENT_TYPE_SW) {
-		VIN("Use SW vblank");
+		tdm_output_dpms dpms;
+
+		tdm_output_get_dpms(private_vblank->output, &dpms);
+
+		VIN("Use SW vblank. connection(%s), dpms(%s), vrefresh(%d), fps(%d), offset(%d)",
+			tdm_status_str(private_vblank->connection), tdm_dpms_str(dpms),
+			private_vblank->vrefresh, private_vblank->fps, private_vblank->offset);
 		private_vblank->last_type = VBLANK_EVENT_TYPE_SW;
 	}
 
 	if (private_vblank->last_time == 0) {
 		/* SW vblank starts from now. SW vblank doesn't need to be aligned with HW vblank. */
 		private_vblank->last_seq = 0;
-		private_vblank->last_time = tdm_helper_get_time();
+		private_vblank->last_time = tdm_helper_get_time() - private_vblank->vblank_gap;
 
 		/* +1 ms to call the handler ASAP at the first. no matter for SW timer. */
 		wait_info->target_seq = 1;
-		wait_info->target_time = private_vblank->last_time + 0.001;
-
-		VDB("wait(%p) last(%.6f) target(%.6f) target sequence(%u)",
-			wait_info, private_vblank->last_time, wait_info->target_time, wait_info->target_seq);
-	} else {
-		double last, prev, req, curr, target;
-		unsigned int skip;
+	}
 
-		last = private_vblank->last_time;
-		req = wait_info->req_time;
+	last = private_vblank->last_time;
+	req = wait_info->req_time;
 
-		/* make sure that req time is bigger than last. */
-		if (req < last)
-			req = last;
+	/* make sure that req time is bigger than last. */
+	if (req < last)
+		req = last;
 
-		skip = (unsigned int)((req - last) / private_vblank->vblank_gap + TDM_TIME_MARGIN);
-		prev = last + private_vblank->vblank_gap * skip;
+	skip = (unsigned int)((req - last) / private_vblank->vblank_gap + TDM_TIME_MARGIN);
+	prev = last + private_vblank->vblank_gap * skip;
 
-		curr = tdm_helper_get_time();
-		target = prev + private_vblank->vblank_gap * wait_info->interval;
+	curr = tdm_helper_get_time();
+	target = prev + private_vblank->vblank_gap * wait_info->interval;
 
-		while (target < curr)
-			target += private_vblank->vblank_gap;
+	while (target < curr)
+		target += private_vblank->vblank_gap;
 
-		wait_info->target_seq = private_vblank->last_seq;
-		wait_info->target_seq += (unsigned int)((target - last) / private_vblank->vblank_gap + TDM_TIME_MARGIN);
+	wait_info->target_seq = private_vblank->last_seq;
+	wait_info->target_seq += (unsigned int)((target - last) / private_vblank->vblank_gap + TDM_TIME_MARGIN);
 
-		wait_info->target_time = target;
+	wait_info->target_time = target + (double)(private_vblank->offset) / 1000;
 
-		VDB("wait(%p) last(%.6f) req(%.6f) prev(%.6f) curr(%.6f) targ(%.6f,%.6f) skip(%u) targ_seq(%u)",
-			wait_info, last, req - last, prev - last, curr - last,
-			target, target - last, skip, wait_info->target_seq);
-	}
+	VDB("wait(%p) last(%.6f) req(%.6f) prev(%.6f) curr(%.6f) targ(%.6f,%.6f) skip(%u) targ_seq(%u)",
+		wait_info, last, req - last, prev - last, curr - last,
+		target, target - last, skip, wait_info->target_seq);
 
 	_tdm_vblank_insert_wait(wait_info, &private_vblank->SW_wait_list);
 
@@ -1287,6 +1495,7 @@ tdm_vblank_wait(tdm_vblank *vblank, unsigned int req_sec, unsigned int req_usec,
 
 	TDM_RETURN_VAL_IF_FAIL(tdm_vblank_is_valid(vblank), TDM_ERROR_INVALID_PARAMETER);
 	TDM_RETURN_VAL_IF_FAIL(func != NULL, TDM_ERROR_INVALID_PARAMETER);
+	TDM_RETURN_VAL_IF_FAIL(interval > 0, TDM_ERROR_INVALID_PARAMETER);
 
 	if (private_vblank->in_create_handler) {
 		TDM_ERR("NOT allowed to be called in a create handler");
@@ -1318,6 +1527,7 @@ tdm_vblank_wait(tdm_vblank *vblank, unsigned int req_sec, unsigned int req_usec,
 		return TDM_ERROR_OUT_OF_MEMORY;
 		/* LCOV_EXCL_STOP */
 	}
+	_tdm_vblank_update_output_info(private_vblank);
 
 	/* set request time to current time if 0. This function seems to be called in server side. */
 	if (req_sec == 0 && req_usec == 0) {
@@ -1337,7 +1547,8 @@ tdm_vblank_wait(tdm_vblank *vblank, unsigned int req_sec, unsigned int req_usec,
 	wait_info->user_data = user_data;
 	wait_info->private_vblank = private_vblank;
 
-	if (private_vblank->ignore_global_fps ||
+	if (!private_vblank->resource ||
+		private_vblank->ignore_global_fps ||
 		vblank_global_fps == 0 ||
 		private_vblank->fps < vblank_global_fps)
 		fps = private_vblank->fps;
@@ -1359,7 +1570,7 @@ tdm_vblank_wait(tdm_vblank *vblank, unsigned int req_sec, unsigned int req_usec,
 	if (private_vblank->vrefresh % fps)
 		wait_info->type = VBLANK_TYPE_SW;
 	else if (TDM_OUTPUT_DPMS_VSYNC_IS_OFF(dpms) ||
-			 private_vblank->connection == TDM_OUTPUT_CONN_STATUS_DISCONNECTED)
+			 private_vblank->connection != TDM_OUTPUT_CONN_STATUS_MODE_SETTED)
 		wait_info->type = VBLANK_TYPE_SW_FAKE;
 	else if (private_vblank->offset == 0)
 		wait_info->type = VBLANK_TYPE_HW;
@@ -1396,6 +1607,10 @@ tdm_vblank_wait(tdm_vblank *vblank, unsigned int req_sec, unsigned int req_usec,
 		/* LCOV_EXCL_STOP */
 	}
 
+	tdm_display_lock(private_vblank->dpy);
+	_tdm_vblank_timeout_timer_update(private_vblank, 1000);
+	tdm_display_unlock(private_vblank->dpy);
+
 	return TDM_ERROR_NONE;
 }
 
@@ -1412,7 +1627,7 @@ tdm_vblank_wait_seq(tdm_vblank *vblank, unsigned int req_sec, unsigned int req_u
 	/* if the sequence of vblank reaches the max value, sequence can be 0. */
 
 	if (private_vblank->last_seq == 0) {
-		TDM_WRN("can't calculate interval with sequence(%u)", sequence);
+		VWR("can't calculate interval with sequence(%u)", sequence);
 		interval = 1;
 	} else if (sequence > private_vblank->last_seq ||
 			   TDM_VBLANK_SEQ_REACHED_MAX(sequence, private_vblank->last_seq)) {
@@ -1440,7 +1655,7 @@ tdm_vblank_wait_seq(tdm_vblank *vblank, unsigned int req_sec, unsigned int req_u
 		interval = (unsigned int)((seq_target - curr) / private_vblank->vblank_gap + TDM_TIME_MARGIN) + 1;
 	} else {
 		/* this seems error. But we handle this like normal to avoid the unexpected error in cliend side */
-		TDM_WRN("sequence(%u) should be over the last sequence(%u)", sequence, private_vblank->last_seq);
+		VER("sequence(%u) should be over the last sequence(%u)", sequence, private_vblank->last_seq);
 		func(vblank, TDM_ERROR_NONE, private_vblank->last_seq,
 			 TDM_TIME_SEC(private_vblank->last_time), TDM_TIME_USEC(private_vblank->last_time),
 			 user_data);
@@ -1509,6 +1724,29 @@ _tdm_vblank_get_waiting_count(tdm_private_vblank *private_vblank)
 	return count;
 }
 
+static void
+_tdm_vblank_get_client_information(tdm_private_vblank *private_vblank, pid_t *pid, const char **name)
+{
+	struct wl_client *client;
+
+	if (!private_vblank->resource)
+		goto no_client;
+
+	client = wl_resource_get_client(private_vblank->resource);
+	if (!client)
+		goto no_client;
+
+	wl_client_get_credentials(client, pid, NULL, NULL);
+	*name = tdm_server_get_client_name(*pid);
+
+	return;
+
+no_client:
+	*pid = 0;
+	*name = NULL;
+	return;
+}
+
 /* LCOV_EXCL_START */
 INTERN void
 tdm_vblank_get_vblank_list_information(tdm_display *dpy, char *reply, int *len)
@@ -1533,13 +1771,7 @@ tdm_vblank_get_vblank_list_information(tdm_display *dpy, char *reply, int *len)
 		pid_t pid = 0;
 		unsigned int count;
 
-		if (v->resource) {
-			struct wl_client *client = wl_resource_get_client(v->resource);
-			if (client) {
-				wl_client_get_credentials(client, &pid, NULL, NULL);
-				proc_name = tdm_server_get_client_name(pid);
-			}
-		}
+		_tdm_vblank_get_client_information(v, &pid, &proc_name);
 
 		count = _tdm_vblank_get_waiting_count(v);