X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Ftdm_output.c;h=f4c818bccd328015cc6830c1c49dec7f4bb3b3e5;hb=9bd49c10734de8b55679ecd3bb663200354bc5b7;hp=43efed1b8021a08ad83757ef2b7f3fb6af5cc637;hpb=b28f4175918e663075033cc185959f69a710f7e0;p=platform%2Fcore%2Fuifw%2Flibtdm.git

diff --git a/src/tdm_output.c b/src/tdm_output.c
index 43efed1..f4c818b 100644
--- a/src/tdm_output.c
+++ b/src/tdm_output.c
@@ -429,7 +429,7 @@ tdm_output_cb_dpms(tdm_output *output_backend, tdm_output_dpms dpms, void *user_
 	tdm_private_output *private_output = user_data;
 	tdm_error ret;
 
-	TDM_INFO("output(%d) %s", private_output->pipe, tdm_status_str(dpms));
+	TDM_INFO("output(%d) %s", private_output->pipe, tdm_dpms_str(dpms));
 
 	private_output->current_dpms_value = dpms;
 	private_output->waiting_dpms_change = 0;
@@ -526,7 +526,7 @@ tdm_output_add_mode_change_request_handler(tdm_output *output,
 		}
 	}
 
-	mode_change_handler = calloc(1, sizeof(tdm_private_output_change_handler));
+	mode_change_handler = calloc(1, sizeof(tdm_private_output_mode_change_handler));
 	if (!mode_change_handler) {
 		/* LCOV_EXCL_START */
 		TDM_ERR("failed: alloc memory");
@@ -1427,6 +1427,7 @@ tdm_output_set_voutput_commit(tdm_voutput *voutput)
 		ret = tdm_voutput_set_commit_func(private_voutput, _tdm_voutput_cb_commit);
 		if (ret != TDM_ERROR_NONE) {
 			TDM_ERR("failed: tdm_voutput_set_commit_func");
+			_pthread_mutex_unlock(&private_display->lock);
 			return ret;
 		}
 	}
@@ -1629,8 +1630,11 @@ tdm_output_commit_internal(tdm_output *output, int sync, tdm_output_commit_handl
 
 	if (TDM_OUTPUT_DPMS_VSYNC_IS_OFF(dpms_value)) {
 		TDM_WRN("dpms %s. Directly call commit handler instead of commit.", tdm_dpms_str(dpms_value));
-		if (func)
+		if (func) {
+			_pthread_mutex_unlock(&private_display->lock);
 			func(output, 0, 0, 0, user_data);
+			_pthread_mutex_lock(&private_display->lock);
+		}
 	}
 
 	return ret;
@@ -2023,6 +2027,52 @@ tdm_output_get_hwc(tdm_output *output, tdm_error *error)
 	return private_hwc;
 }
 
+EXTERN tdm_error
+tdm_output_set_mirror(tdm_output *output, tdm_output *src_output, tdm_transform transform)
+{
+	/* LCOV_EXCL_START */
+	tdm_private_module *private_module;
+	tdm_func_output *func_output;
+	tdm_private_output *private_src_output;
+
+	OUTPUT_FUNC_ENTRY();
+
+	TDM_RETURN_VAL_IF_FAIL(src_output != NULL, TDM_ERROR_INVALID_PARAMETER);
+
+	_pthread_mutex_lock(&private_display->lock);
+
+	private_module = private_output->private_module;
+	func_output = &private_module->func_output;
+	private_src_output = (tdm_private_output*)src_output;
+
+	if (!(private_output->caps.capabilities & TDM_OUTPUT_CAPABILITY_MIRROR)) {
+		TDM_INFO("output(%d) doesn't support the mirror.", private_output->pipe);
+		_pthread_mutex_unlock(&private_display->lock);
+		return TDM_ERROR_BAD_REQUEST;
+	}
+
+	if (!func_output->output_set_mirror) {
+		TDM_WRN("not implemented!!");
+		_pthread_mutex_unlock(&private_display->lock);
+		return TDM_ERROR_NOT_IMPLEMENTED;
+	}
+
+	ret = func_output->output_set_mirror(private_output->output_backend,
+										private_src_output->output_backend,
+										transform);
+	if (ret != TDM_ERROR_NONE) {
+		TDM_ERR("output(%p) fails to set MIRROR.", private_output);
+		_pthread_mutex_unlock(&private_display->lock);
+		return TDM_ERROR_BAD_REQUEST;
+	}
+
+	_pthread_mutex_unlock(&private_display->lock);
+
+	/* LCOV_EXCL_STOP */
+
+	return ret;
+}
+
 INTERN tdm_error
 tdm_output_choose_commit_per_vblank_mode(tdm_private_output *private_output, int mode)
 {