X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Ftdm_output.c;h=a8b5065cd96888c761d8ff061556bc09ab20e3f1;hb=fea25ace45feadad465b8b3a65233315ca66bc22;hp=e73de5b61716967c26e5cde93537e4c3f2df0c67;hpb=54717e8e017c5e985e43f45c81528dd730e7d3d3;p=platform%2Fcore%2Fuifw%2Flibtdm.git

diff --git a/src/tdm_output.c b/src/tdm_output.c
index e73de5b..a8b5065 100644
--- a/src/tdm_output.c
+++ b/src/tdm_output.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
@@ -146,28 +146,30 @@ tdm_output_init(tdm_private_display *private_display)
 {
 	tdm_thread_cb_set_find_func(TDM_THREAD_CB_OUTPUT_COMMIT, tdm_display_find_output_stamp);
 	tdm_thread_cb_set_find_func(TDM_THREAD_CB_OUTPUT_VBLANK, tdm_display_find_output_stamp);
-	tdm_thread_cb_set_find_func(TDM_THREAD_CB_OUTPUT_CHANGE, tdm_display_find_output_stamp);
+	tdm_thread_cb_set_find_func(TDM_THREAD_CB_OUTPUT_STATUS, tdm_display_find_output_stamp);
+	tdm_thread_cb_set_find_func(TDM_THREAD_CB_OUTPUT_DPMS, tdm_display_find_output_stamp);
+
 
 	return TDM_ERROR_NONE;
 }
 
-EXTERN tdm_backend *
-tdm_output_get_backend(tdm_output *output, tdm_error *error)
+EXTERN tdm_module *
+tdm_output_get_backend_module(tdm_output *output, tdm_error *error)
 {
-	tdm_private_backend *private_backend;
+	tdm_private_module *private_module;
 
 	OUTPUT_FUNC_ENTRY_ERROR();
 
 	_pthread_mutex_lock(&private_display->lock);
 
-	private_backend = private_output->private_backend;
+	private_module = private_output->private_module;
 
 	if (error)
 		*error = TDM_ERROR_NONE;
 
 	_pthread_mutex_unlock(&private_display->lock);
 
-	return private_backend;
+	return private_module;
 }
 
 EXTERN tdm_error
@@ -226,34 +228,68 @@ INTERN void
 tdm_output_thread_cb_change(tdm_private_display *private_display, void *object, tdm_thread_cb_base *cb_base, void *user_data)
 {
 	tdm_private_output *private_output = object;
-	tdm_thread_cb_output_change *output_change = (tdm_thread_cb_output_change *)cb_base;
 	tdm_private_output_change_handler *change_handler = user_data;
+	tdm_output_change_type type = TDM_OUTPUT_CHANGE_CONNECTION;
+	tdm_value value = {.u32 = 0 };
 
 	TDM_RETURN_IF_FAIL(TDM_MUTEX_IS_LOCKED());
 
 	assert(change_handler->owner_tid == syscall(SYS_gettid));
 
+	if (cb_base->type == TDM_THREAD_CB_OUTPUT_STATUS) {
+		tdm_thread_cb_output_status *output_status = (tdm_thread_cb_output_status *)cb_base;
+		type = TDM_OUTPUT_CHANGE_CONNECTION;
+		value.u32 = output_status->status;
+	} else if (cb_base->type == TDM_THREAD_CB_OUTPUT_DPMS) {
+		tdm_thread_cb_output_dpms *output_dpms = (tdm_thread_cb_output_dpms *)cb_base;
+		type = TDM_OUTPUT_CHANGE_DPMS;
+		value.u32 = output_dpms->dpms;
+	} else {
+		TDM_NEVER_GET_HERE();
+		return;
+	}
+
 	_pthread_mutex_unlock(&private_display->lock);
-	change_handler->func(private_output, output_change->type, output_change->value, change_handler->user_data);
+	change_handler->func(private_output, type, value, change_handler->user_data);
 	_pthread_mutex_lock(&private_display->lock);
+
+}
+
+static tdm_error
+_tdm_output_call_thread_cb_status(tdm_private_output *private_output, tdm_output_conn_status status)
+{
+	tdm_thread_cb_output_status output_status;
+	tdm_error ret;
+
+	memset(&output_status, 0, sizeof output_status);
+	output_status.base.type = TDM_THREAD_CB_OUTPUT_STATUS;
+	output_status.base.length = sizeof output_status;
+	output_status.base.object_stamp = private_output->stamp;
+	output_status.base.data = NULL;
+	output_status.base.sync = 1;
+	output_status.status = status;
+
+	ret = tdm_thread_cb_call(private_output, &output_status.base, 1);
+	TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
+
+	return TDM_ERROR_NONE;
 }
 
 static tdm_error
-_tdm_output_call_thread_cb_change(tdm_private_output *private_output, tdm_output_change_type type, tdm_value value)
+_tdm_output_call_thread_cb_dpms(tdm_private_output *private_output, tdm_output_dpms dpms)
 {
-	tdm_thread_cb_output_change output_change;
+	tdm_thread_cb_output_dpms output_dpms;
 	tdm_error ret;
 
-	memset(&output_change, 0, sizeof output_change);
-	output_change.base.type = TDM_THREAD_CB_OUTPUT_CHANGE;
-	output_change.base.length = sizeof output_change;
-	output_change.base.object_stamp = private_output->stamp;
-	output_change.base.data = NULL;
-	output_change.base.sync = 1;
-	output_change.type = type;
-	output_change.value = value;
+	memset(&output_dpms, 0, sizeof output_dpms);
+	output_dpms.base.type = TDM_THREAD_CB_OUTPUT_DPMS;
+	output_dpms.base.length = sizeof output_dpms;
+	output_dpms.base.object_stamp = private_output->stamp;
+	output_dpms.base.data = NULL;
+	output_dpms.base.sync = 0;
+	output_dpms.dpms = dpms;
 
-	ret = tdm_thread_cb_call(private_output, &output_change.base);
+	ret = tdm_thread_cb_call(private_output, &output_dpms.base, 1);
 	TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
 
 	return TDM_ERROR_NONE;
@@ -263,7 +299,6 @@ INTERN void
 tdm_output_cb_status(tdm_output *output_backend, tdm_output_conn_status status, void *user_data)
 {
 	tdm_private_output *private_output = user_data;
-	tdm_value value;
 	tdm_error ret;
 
 	TDM_RETURN_IF_FAIL(private_output);
@@ -272,15 +307,13 @@ tdm_output_cb_status(tdm_output *output_backend, tdm_output_conn_status status,
 
 	if ((private_output->caps.status == TDM_OUTPUT_CONN_STATUS_DISCONNECTED && status != TDM_OUTPUT_CONN_STATUS_DISCONNECTED) ||
 		(private_output->caps.status != TDM_OUTPUT_CONN_STATUS_DISCONNECTED && status == TDM_OUTPUT_CONN_STATUS_DISCONNECTED)) {
-		ret = tdm_display_update_output(private_output->private_backend, output_backend, private_output->pipe, 1);
+		ret = tdm_display_update_output(private_output->private_module, output_backend, private_output->pipe, 1);
 		TDM_RETURN_IF_FAIL(ret == TDM_ERROR_NONE);
 	} else {
 		private_output->caps.status = status;
 	}
 
-	value.u32 = status;
-
-	ret = _tdm_output_call_thread_cb_change(private_output, TDM_OUTPUT_CHANGE_CONNECTION, value);
+	ret = _tdm_output_call_thread_cb_status(private_output, status);
 	TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
 }
 
@@ -288,7 +321,6 @@ INTERN void
 tdm_output_cb_dpms(tdm_output *output_backend, tdm_output_dpms dpms, void *user_data)
 {
 	tdm_private_output *private_output = user_data;
-	tdm_value value;
 	tdm_error ret;
 
 	TDM_INFO("output(%d) %s", private_output->pipe, tdm_status_str(dpms));
@@ -297,9 +329,7 @@ tdm_output_cb_dpms(tdm_output *output_backend, tdm_output_dpms dpms, void *user_
 	private_output->waiting_dpms_change = 0;
 	TDM_INFO("output(%d) dpms async '%s' done", private_output->pipe, tdm_dpms_str(dpms));
 
-	value.u32 = dpms;
-
-	ret = _tdm_output_call_thread_cb_change(private_output, TDM_OUTPUT_CHANGE_DPMS, value);
+	ret = _tdm_output_call_thread_cb_dpms(private_output, dpms);
 	TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
 }
 
@@ -332,7 +362,7 @@ tdm_output_add_change_handler(tdm_output *output,
 		/* LCOV_EXCL_STOP */
 	}
 
-	ret = tdm_thread_cb_add(private_output, TDM_THREAD_CB_OUTPUT_CHANGE, NULL, tdm_output_thread_cb_change, change_handler);
+	ret = tdm_thread_cb_add(private_output, TDM_THREAD_CB_OUTPUT_DPMS, NULL, tdm_output_thread_cb_change, change_handler);
 	if (ret != TDM_ERROR_NONE) {
 		/* LCOV_EXCL_START */
 		TDM_ERR("tdm_thread_cb_add failed");
@@ -342,6 +372,17 @@ tdm_output_add_change_handler(tdm_output *output,
 		/* LCOV_EXCL_STOP */
 	}
 
+	ret = tdm_thread_cb_add(private_output, TDM_THREAD_CB_OUTPUT_STATUS, NULL, tdm_output_thread_cb_change, change_handler);
+	if (ret != TDM_ERROR_NONE) {
+		/* LCOV_EXCL_START */
+		TDM_ERR("tdm_thread_cb_add failed");
+		tdm_thread_cb_remove(private_output, TDM_THREAD_CB_OUTPUT_DPMS, NULL, tdm_output_thread_cb_change, change_handler);
+		free(change_handler);
+		_pthread_mutex_unlock(&private_display->lock);
+		return TDM_ERROR_OPERATION_FAILED;
+		/* LCOV_EXCL_STOP */
+	}
+
 	change_handler->private_output = private_output;
 	change_handler->func = func;
 	change_handler->user_data = user_data;
@@ -375,7 +416,8 @@ tdm_output_remove_change_handler(tdm_output *output,
 		if (change_handler->func != func || change_handler->user_data != user_data)
 			continue;
 
-		tdm_thread_cb_remove(private_output, TDM_THREAD_CB_OUTPUT_CHANGE, NULL, tdm_output_thread_cb_change, change_handler);
+		tdm_thread_cb_remove(private_output, TDM_THREAD_CB_OUTPUT_DPMS, NULL, tdm_output_thread_cb_change, change_handler);
+		tdm_thread_cb_remove(private_output, TDM_THREAD_CB_OUTPUT_STATUS, NULL, tdm_output_thread_cb_change, change_handler);
 
 		LIST_DEL(&change_handler->link);
 		free(change_handler);
@@ -538,7 +580,7 @@ tdm_output_get_cursor_available_size(tdm_output *output, int *min_w, int *min_h,
 
 	_pthread_mutex_lock(&private_display->lock);
 
-	if (!tdm_backend_check_module_abi(private_output->private_backend, 1, 5)) {
+	if (!tdm_module_check_abi(private_output->private_module, 1, 5)) {
 		_pthread_mutex_unlock(&private_display->lock);
 		return TDM_ERROR_BAD_REQUEST;
 	}
@@ -632,14 +674,14 @@ tdm_output_get_primary_index(tdm_output *output, int *index)
 EXTERN tdm_error
 tdm_output_set_property(tdm_output *output, unsigned int id, tdm_value value)
 {
-	tdm_private_backend *private_backend;
+	tdm_private_module *private_module;
 	tdm_func_output *func_output;
 	OUTPUT_FUNC_ENTRY();
 
 	_pthread_mutex_lock(&private_display->lock);
 
-	private_backend = private_output->private_backend;
-	func_output = &private_backend->func_output;
+	private_module = private_output->private_module;
+	func_output = &private_module->func_output;
 
 	if (!func_output->output_set_property) {
 		/* LCOV_EXCL_START */
@@ -660,7 +702,7 @@ tdm_output_set_property(tdm_output *output, unsigned int id, tdm_value value)
 EXTERN tdm_error
 tdm_output_get_property(tdm_output *output, unsigned int id, tdm_value *value)
 {
-	tdm_private_backend *private_backend;
+	tdm_private_module *private_module;
 	tdm_func_output *func_output;
 	OUTPUT_FUNC_ENTRY();
 
@@ -668,8 +710,8 @@ tdm_output_get_property(tdm_output *output, unsigned int id, tdm_value *value)
 
 	_pthread_mutex_lock(&private_display->lock);
 
-	private_backend = private_output->private_backend;
-	func_output = &private_backend->func_output;
+	private_module = private_output->private_module;
+	func_output = &private_module->func_output;
 
 	if (!func_output->output_get_property) {
 		/* LCOV_EXCL_START */
@@ -766,7 +808,10 @@ _tdm_output_cb_vblank(tdm_output *output_backend, unsigned int sequence,
 
 	vblank_handler->sent_to_frontend = 1;
 
-	ret = tdm_thread_cb_call(vblank_handler->private_output, &output_vblank.base);
+	if (tdm_debug_module & TDM_DEBUG_COMMIT)
+		TDM_INFO("output(%d) wait_vblank: handler(%p)", vblank_handler->private_output->pipe, vblank_handler);
+
+	ret = tdm_thread_cb_call(vblank_handler->private_output, &output_vblank.base, 1);
 	TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
 }
 
@@ -842,7 +887,7 @@ _tdm_output_cb_commit(tdm_output *output_backend, unsigned int sequence,
 	output_commit.tv_sec = tv_sec;
 	output_commit.tv_usec = tv_usec;
 
-	ret = tdm_thread_cb_call(private_output, &output_commit.base);
+	ret = tdm_thread_cb_call(private_output, &output_commit.base, 1);
 	TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
 }
 
@@ -855,15 +900,15 @@ _tdm_output_wait_vblank(tdm_private_output *private_output, int interval, int sy
 						tdm_output_vblank_handler func, void *user_data,
 						unsigned int add_front)
 {
-	tdm_private_backend *private_backend;
+	tdm_private_module *private_module;
 	tdm_func_output *func_output;
 	tdm_private_output_vblank_handler *vblank_handler = NULL, *v = NULL;
 	unsigned int skip_request = 0;
 	pid_t tid = syscall(SYS_gettid);
 	tdm_error ret = TDM_ERROR_NONE;
 
-	private_backend = private_output->private_backend;
-	func_output = &private_backend->func_output;
+	private_module = private_output->private_module;
+	func_output = &private_module->func_output;
 
 	/* interval SHOULD be at least 1 */
 	if (interval <= 0)
@@ -1060,7 +1105,7 @@ INTERN tdm_error
 tdm_output_commit_internal(tdm_output *output, int sync, tdm_output_commit_handler func, void *user_data)
 {
 	tdm_private_output *private_output;
-	tdm_private_backend *private_backend;
+	tdm_private_module *private_module;
 	tdm_func_output *func_output;
 	tdm_private_output_commit_handler *output_commit_handler = NULL;
 	tdm_private_layer *private_layer = NULL;
@@ -1070,8 +1115,8 @@ tdm_output_commit_internal(tdm_output *output, int sync, tdm_output_commit_handl
 	TDM_RETURN_VAL_IF_FAIL(tdm_output_is_valid(output), TDM_ERROR_INVALID_PARAMETER);
 
 	private_output = (tdm_private_output*)output;
-	private_backend = private_output->private_backend;
-	func_output = &private_backend->func_output;
+	private_module = private_output->private_module;
+	func_output = &private_module->func_output;
 
 	if (!func_output->output_commit) {
 		/* LCOV_EXCL_START */
@@ -1084,39 +1129,47 @@ tdm_output_commit_internal(tdm_output *output, int sync, tdm_output_commit_handl
 	TDM_RETURN_VAL_IF_FAIL(ret == TDM_ERROR_NONE, ret);
 
 	if (!TDM_OUTPUT_DPMS_VSYNC_IS_OFF(dpms_value)) {
-		if (func) {
-			if (!private_output->regist_commit_cb) {
-				private_output->regist_commit_cb = 1;
-				ret = func_output->output_set_commit_handler(private_output->output_backend, _tdm_output_cb_commit);
-				TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, commit_failed);
-			}
-
-			output_commit_handler = calloc(1, sizeof(tdm_private_output_commit_handler));
-			if (!output_commit_handler) {
-				/* LCOV_EXCL_START */
-				TDM_ERR("failed: alloc memory");
-				return TDM_ERROR_OUT_OF_MEMORY;
-				/* LCOV_EXCL_STOP */
-			}
+		if (!private_output->regist_commit_cb) {
+			private_output->regist_commit_cb = 1;
+			ret = func_output->output_set_commit_handler(private_output->output_backend, _tdm_output_cb_commit);
+			TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, commit_failed);
+		}
 
-			ret = tdm_thread_cb_add(private_output, TDM_THREAD_CB_OUTPUT_COMMIT, output_commit_handler, _tdm_output_thread_cb_commit, NULL);
-			if (ret != TDM_ERROR_NONE) {
-				TDM_ERR("tdm_thread_cb_add failed");
-				free(output_commit_handler);
-				return ret;
-			}
+		output_commit_handler = calloc(1, sizeof(tdm_private_output_commit_handler));
+		if (!output_commit_handler) {
+			/* LCOV_EXCL_START */
+			TDM_ERR("failed: alloc memory");
+			return TDM_ERROR_OUT_OF_MEMORY;
+			/* LCOV_EXCL_STOP */
+		}
 
-			LIST_ADDTAIL(&output_commit_handler->link, &private_output->output_commit_handler_list);
-			output_commit_handler->private_output = private_output;
-			output_commit_handler->func = func;
-			output_commit_handler->user_data = user_data;
-			output_commit_handler->owner_tid = syscall(SYS_gettid);
+		ret = tdm_thread_cb_add(private_output, TDM_THREAD_CB_OUTPUT_COMMIT, output_commit_handler, _tdm_output_thread_cb_commit, NULL);
+		if (ret != TDM_ERROR_NONE) {
+			TDM_ERR("tdm_thread_cb_add failed");
+			free(output_commit_handler);
+			return ret;
 		}
 
+		LIST_ADDTAIL(&output_commit_handler->link, &private_output->output_commit_handler_list);
+		output_commit_handler->private_output = private_output;
+		output_commit_handler->func = func;
+		output_commit_handler->user_data = user_data;
+		output_commit_handler->owner_tid = syscall(SYS_gettid);
+
 		ret = func_output->output_commit(private_output->output_backend, sync,
 				output_commit_handler);
 		TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, commit_failed);
 
+		if (ret == TDM_ERROR_NONE) {
+			if (private_output->current_mode &&
+				private_output->caps.status != TDM_OUTPUT_CONN_STATUS_MODE_SETTED) {
+				TDM_WRN("backend doesn't change the output connection status");
+				tdm_output_cb_status(private_output->output_backend,
+									 TDM_OUTPUT_CONN_STATUS_MODE_SETTED,
+									 private_output);
+			}
+		}
+
 		if (tdm_debug_module & TDM_DEBUG_COMMIT)
 			TDM_INFO("output(%d) backend commit: handle(%p) func(%p) user_data(%p)",
 					private_output->pipe, output_commit_handler, func, user_data);
@@ -1129,6 +1182,15 @@ tdm_output_commit_internal(tdm_output *output, int sync, tdm_output_commit_handl
 		if (!private_layer->waiting_buffer)
 			continue;
 
+		if (private_layer->committed_buffer) {
+			tdm_layer_free_buffer(private_layer, private_layer->committed_buffer);
+			private_layer->committed_buffer = NULL;
+			if (tdm_debug_module & TDM_DEBUG_BUFFER)
+				TDM_INFO("layer(%p) waiting_buffer(%p) committed_buffer(%p)",
+						 private_layer, private_layer->waiting_buffer->buffer,
+						 private_layer->committed_buffer);
+		}
+
 		private_layer->committed_buffer = private_layer->waiting_buffer;
 		private_layer->waiting_buffer = NULL;
 		if (tdm_debug_module & TDM_DEBUG_BUFFER)
@@ -1205,7 +1267,7 @@ tdm_output_commit(tdm_output *output, int sync, tdm_output_commit_handler func,
 EXTERN tdm_error
 tdm_output_set_mode(tdm_output *output, const tdm_output_mode *mode)
 {
-	tdm_private_backend *private_backend;
+	tdm_private_module *private_module;
 	tdm_func_output *func_output;
 	OUTPUT_FUNC_ENTRY();
 
@@ -1213,8 +1275,8 @@ tdm_output_set_mode(tdm_output *output, const tdm_output_mode *mode)
 
 	_pthread_mutex_lock(&private_display->lock);
 
-	private_backend = private_output->private_backend;
-	func_output = &private_backend->func_output;
+	private_module = private_output->private_module;
+	func_output = &private_module->func_output;
 
 	if (!func_output->output_set_mode) {
 		/* LCOV_EXCL_START */
@@ -1255,7 +1317,7 @@ tdm_output_get_mode(tdm_output *output, const tdm_output_mode **mode)
 EXTERN tdm_error
 tdm_output_set_dpms(tdm_output *output, tdm_output_dpms dpms_value)
 {
-	tdm_private_backend *private_backend;
+	tdm_private_module *private_module;
 	tdm_func_output *func_output;
 	OUTPUT_FUNC_ENTRY();
 
@@ -1280,8 +1342,8 @@ tdm_output_set_dpms(tdm_output *output, tdm_output_dpms dpms_value)
 		return TDM_ERROR_BAD_REQUEST;
 	}
 
-	private_backend = private_output->private_backend;
-	func_output = &private_backend->func_output;
+	private_module = private_output->private_module;
+	func_output = &private_module->func_output;
 
 	TDM_INFO("output(%d) dpms '%s'", private_output->pipe, tdm_dpms_str(dpms_value));
 
@@ -1298,12 +1360,10 @@ tdm_output_set_dpms(tdm_output *output, tdm_output_dpms dpms_value)
 done:
 	if (ret == TDM_ERROR_NONE) {
 		if (private_output->current_dpms_value != dpms_value) {
-			tdm_value value;
 			private_output->current_dpms_value = dpms_value;
-			value.u32 = dpms_value;
-			_tdm_output_call_thread_cb_change(private_output, TDM_OUTPUT_CHANGE_DPMS, value);
-			TDM_INFO("output(%d) dpms '%s' done", private_output->pipe, tdm_dpms_str(dpms_value));
+			_tdm_output_call_thread_cb_dpms(private_output, dpms_value);
 		}
+		TDM_INFO("output(%d) dpms '%s' done", private_output->pipe, tdm_dpms_str(dpms_value));
 	} else {
 		tdm_output_dpms temp = TDM_OUTPUT_DPMS_OFF;
 
@@ -1322,7 +1382,7 @@ done:
 EXTERN tdm_error
 tdm_output_set_dpms_async(tdm_output *output, tdm_output_dpms dpms_value)
 {
-	tdm_private_backend *private_backend;
+	tdm_private_module *private_module;
 	tdm_func_output *func_output;
 	OUTPUT_FUNC_ENTRY();
 
@@ -1352,8 +1412,8 @@ tdm_output_set_dpms_async(tdm_output *output, tdm_output_dpms dpms_value)
 		return TDM_ERROR_BAD_REQUEST;
 	}
 
-	private_backend = private_output->private_backend;
-	func_output = &private_backend->func_output;
+	private_module = private_output->private_module;
+	func_output = &private_module->func_output;
 	if (!func_output->output_set_dpms_handler) {
 		TDM_WRN("not implemented: output_set_dpms_handler");
 		_pthread_mutex_unlock(&private_display->lock);
@@ -1403,7 +1463,7 @@ INTERN tdm_error
 tdm_output_get_dpms_internal(tdm_output *output, tdm_output_dpms *dpms_value)
 {
 	tdm_private_output *private_output;
-	tdm_private_backend *private_backend;
+	tdm_private_module *private_module;
 	tdm_func_output *func_output;
 	tdm_error ret = TDM_ERROR_NONE;
 
@@ -1421,8 +1481,8 @@ tdm_output_get_dpms_internal(tdm_output *output, tdm_output_dpms *dpms_value)
 		return TDM_ERROR_NONE;
 	}
 
-	private_backend = private_output->private_backend;
-	func_output = &private_backend->func_output;
+	private_module = private_output->private_module;
+	func_output = &private_module->func_output;
 
 	if (!func_output->output_get_dpms) {
 		/* LCOV_EXCL_START */
@@ -1442,13 +1502,11 @@ tdm_output_get_dpms_internal(tdm_output *output, tdm_output_dpms *dpms_value)
 
 	/* checking with backend's value */
 	if (*dpms_value != private_output->current_dpms_value) {
-		tdm_value value;
 		TDM_ERR("output(%d) dpms changed suddenly: %s -> %s",
-				private_output->pipe, private_output->current_dpms_value,
+				private_output->pipe, tdm_dpms_str(private_output->current_dpms_value),
 				tdm_dpms_str(*dpms_value));
 		private_output->current_dpms_value = *dpms_value;
-		value.u32 = *dpms_value;
-		_tdm_output_call_thread_cb_change(private_output, TDM_OUTPUT_CHANGE_DPMS, value);
+		_tdm_output_call_thread_cb_dpms(private_output, *dpms_value);
 	}
 
 	return ret;
@@ -1470,6 +1528,31 @@ tdm_output_get_dpms(tdm_output *output, tdm_output_dpms *dpms_value)
 	return ret;
 }
 
+EXTERN tdm_error
+tdm_output_has_capture_capability(tdm_output *output, unsigned int *has_capability)
+{
+	tdm_private_module *private_module;
+
+	OUTPUT_FUNC_ENTRY();
+
+	TDM_RETURN_VAL_IF_FAIL(has_capability != NULL, TDM_ERROR_INVALID_PARAMETER);
+
+	_pthread_mutex_lock(&private_display->lock);
+
+	private_module = private_output->private_module;
+
+	if (!(private_module->capabilities & TDM_DISPLAY_CAPABILITY_CAPTURE))
+		*has_capability = 0;
+	else if (!(private_module->caps_capture.capabilities & TDM_CAPTURE_CAPABILITY_OUTPUT))
+		*has_capability = 0;
+	else
+		*has_capability = 1;
+
+	_pthread_mutex_unlock(&private_display->lock);
+
+	return ret;
+}
+
 EXTERN tdm_capture *
 tdm_output_create_capture(tdm_output *output, tdm_error *error)
 {
@@ -1554,7 +1637,7 @@ EXTERN tdm_error
 tdm_output_hwc_validate(tdm_output *output, tdm_hwc_window **composited_wnds,
 									uint32_t num_wnds, uint32_t *num_types)
 {
-	tdm_private_backend *private_backend;
+	tdm_private_module *private_module;
 	tdm_func_output *func_output = NULL;
 	tdm_private_hwc_window **composited_wnds_frontend = NULL;
 	tdm_hwc_window **composited_wnds_backend = NULL;
@@ -1572,8 +1655,8 @@ tdm_output_hwc_validate(tdm_output *output, tdm_hwc_window **composited_wnds,
 		return TDM_ERROR_BAD_REQUEST;
 	}
 
-	private_backend = private_output->private_backend;
-	func_output = &private_backend->func_output;
+	private_module = private_output->private_module;
+	func_output = &private_module->func_output;
 
 	if (!func_output->output_hwc_validate) {
 		/* LCOV_EXCL_START */
@@ -1649,7 +1732,7 @@ tdm_output_hwc_get_changed_composition_types(tdm_output *output,
 										 tdm_hwc_window **hwc_window,
 										 tdm_hwc_window_composition *composition_types)
 {
-	tdm_private_backend *private_backend;
+	tdm_private_module *private_module;
 	tdm_func_output *func_output = NULL;
 	tdm_private_hwc_window * private_hwc_window = NULL;
 	int i = 0;
@@ -1666,8 +1749,8 @@ tdm_output_hwc_get_changed_composition_types(tdm_output *output,
 		return TDM_ERROR_BAD_REQUEST;
 	}
 
-	private_backend = private_output->private_backend;
-	func_output = &private_backend->func_output;
+	private_module = private_output->private_module;
+	func_output = &private_module->func_output;
 
 	if (!func_output->output_hwc_get_changed_composition_types) {
 		/* LCOV_EXCL_START */
@@ -1716,7 +1799,7 @@ tdm_output_hwc_get_changed_composition_types(tdm_output *output,
 tdm_error
 tdm_output_hwc_accept_changes(tdm_output *output)
 {
-	tdm_private_backend *private_backend;
+	tdm_private_module *private_module;
 	tdm_func_output *func_output = NULL;
 
 	OUTPUT_FUNC_ENTRY();
@@ -1729,8 +1812,8 @@ tdm_output_hwc_accept_changes(tdm_output *output)
 		return TDM_ERROR_BAD_REQUEST;
 	}
 
-	private_backend = private_output->private_backend;
-	func_output = &private_backend->func_output;
+	private_module = private_output->private_module;
+	func_output = &private_module->func_output;
 
 	if (!func_output->output_hwc_validate) {
 		/* LCOV_EXCL_START */
@@ -1750,7 +1833,7 @@ tdm_output_hwc_accept_changes(tdm_output *output)
 tbm_surface_queue_h
 tdm_output_hwc_get_target_buffer_queue(tdm_output *output, tdm_error *error)
 {
-	tdm_private_backend *private_backend;
+	tdm_private_module *private_module;
 	tdm_func_output *func_output = NULL;
 	tbm_surface_queue_h queue = NULL;
 
@@ -1766,8 +1849,8 @@ tdm_output_hwc_get_target_buffer_queue(tdm_output *output, tdm_error *error)
 		return NULL;
 	}
 
-	private_backend = private_output->private_backend;
-	func_output = &private_backend->func_output;
+	private_module = private_output->private_module;
+	func_output = &private_module->func_output;
 
 	if (!func_output->output_hwc_get_target_buffer_queue) {
 		/* LCOV_EXCL_START */
@@ -1787,7 +1870,7 @@ tdm_output_hwc_get_target_buffer_queue(tdm_output *output, tdm_error *error)
 EXTERN tdm_error
 tdm_output_hwc_set_client_target_buffer(tdm_output *output, tbm_surface_h target_buffer, tdm_hwc_region damage)
 {
-	tdm_private_backend *private_backend;
+	tdm_private_module *private_module;
 	tdm_func_output *func_output = NULL;
 
 	OUTPUT_FUNC_ENTRY();
@@ -1810,8 +1893,8 @@ tdm_output_hwc_set_client_target_buffer(tdm_output *output, tbm_surface_h target
 		/* LCOV_EXCL_STOP */
 	}
 
-	private_backend = private_output->private_backend;
-	func_output = &private_backend->func_output;
+	private_module = private_output->private_module;
+	func_output = &private_module->func_output;
 
 	if (!func_output->output_hwc_set_client_target_buffer) {
 		/* LCOV_EXCL_START */
@@ -1831,7 +1914,7 @@ tdm_output_hwc_set_client_target_buffer(tdm_output *output, tbm_surface_h target
 EXTERN tdm_error
 tdm_output_hwc_unset_client_target_buffer(tdm_output *output)
 {
-	tdm_private_backend *private_backend;
+	tdm_private_module *private_module;
 	tdm_func_output *func_output = NULL;
 
 	OUTPUT_FUNC_ENTRY();
@@ -1844,8 +1927,8 @@ tdm_output_hwc_unset_client_target_buffer(tdm_output *output)
 		return TDM_ERROR_BAD_REQUEST;
 	}
 
-	private_backend = private_output->private_backend;
-	func_output = &private_backend->func_output;
+	private_module = private_output->private_module;
+	func_output = &private_module->func_output;
 
 	if (!func_output->output_hwc_unset_client_target_buffer) {
 		/* LCOV_EXCL_START */
@@ -1880,7 +1963,7 @@ _tdm_output_hwc_layer_commit_handler(tdm_layer *layer, unsigned int sequence,
 tdm_error
 tdm_output_hwc_commit_client_target_buffer(tdm_output *output, tdm_output_hwc_target_buffer_commit_handler func, void *user_data)
 {
-	tdm_private_backend *private_backend;
+	tdm_private_module *private_module;
 	tdm_func_output *func_output;
 	tdm_private_output_hwc_target_buffer_commit_handler *output_hwc_target_buffer_commit_handler;
 	tdm_layer *layer = NULL;
@@ -1898,8 +1981,8 @@ tdm_output_hwc_commit_client_target_buffer(tdm_output *output, tdm_output_hwc_ta
 		return TDM_ERROR_BAD_REQUEST;
 	}
 
-	private_backend = private_output->private_backend;
-	func_output = &private_backend->func_output;
+	private_module = private_output->private_module;
+	func_output = &private_module->func_output;
 
 	if (!func_output->output_hwc_get_client_target_buffer_layer) {
 		/* LCOV_EXCL_START */
@@ -2001,7 +2084,7 @@ tdm_error
 tdm_output_hwc_get_video_supported_formats(tdm_output *output, const tbm_format **formats,
 								int *count)
 {
-	tdm_private_backend *private_backend;
+	tdm_private_module *private_module;
 	tdm_func_output *func_output;
 	OUTPUT_FUNC_ENTRY();
 
@@ -2010,8 +2093,8 @@ tdm_output_hwc_get_video_supported_formats(tdm_output *output, const tbm_format
 
 	_pthread_mutex_lock(&private_display->lock);
 
-	private_backend = private_output->private_backend;
-	func_output = &private_backend->func_output;
+	private_module = private_output->private_module;
+	func_output = &private_module->func_output;
 
 	if (!func_output->output_hwc_get_video_supported_formats) {
 		/* LCOV_EXCL_START */
@@ -2032,10 +2115,10 @@ tdm_output_hwc_get_video_supported_formats(tdm_output *output, const tbm_format
 static int
 _is_hwc_output_still_existed(tdm_private_output *private_output)
 {
-	tdm_private_backend *private_backend = private_output->private_backend;
+	tdm_private_module *private_module = private_output->private_module;
 	tdm_private_output *o = NULL;
 
-	LIST_FOR_EACH_ENTRY(o, &private_backend->output_list, link) {
+	LIST_FOR_EACH_ENTRY(o, &private_module->output_list, link) {
 		if (!(o->caps.capabilities & TDM_OUTPUT_CAPABILITY_HWC))
 			continue;
 
@@ -2097,7 +2180,7 @@ _need_validate_handler(int fd, tdm_event_loop_mask mask, void *user_data)
 	ev.base.data = NULL;
 	ev.base.sync = 0;
 
-	ret = tdm_thread_cb_call(private_output, &ev.base);
+	ret = tdm_thread_cb_call(private_output, &ev.base, 1);
 	TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
 
 	TDM_INFO("tdm-thread: get a 'need to revalidate' event for the ouptut:%p.", private_output);