X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Ftdm_display.c;h=814e60c8c836360002ab64d000837c17e0e1bb4d;hb=856926dc88a3fcd8a0f3a578a82bcbba3564ff64;hp=45ccdf2c811431127fd98e6198f8e6eba88f3200;hpb=547570439aa623b2f46197c3362e65f0af93dec1;p=platform%2Fcore%2Fuifw%2Flibtdm.git

diff --git a/src/tdm_display.c b/src/tdm_display.c
index 45ccdf2..814e60c 100644
--- a/src/tdm_display.c
+++ b/src/tdm_display.c
@@ -349,6 +349,124 @@ tdm_display_enable_fps(tdm_private_display *private_display, int enable)
 }
 /* LCOV_EXCL_STOP */
 
+INTERN tdm_error
+tdm_display_call_thread_cb_output_create(tdm_private_display *private_display, tdm_output *output)
+{
+	tdm_thread_cb_display_output_create output_create;
+	tdm_error ret;
+
+	if (LIST_IS_EMPTY(&private_display->output_create_handler_list)) return TDM_ERROR_NONE;
+
+	memset(&output_create, 0, sizeof output_create);
+	output_create.base.type = TDM_THREAD_CB_DISPLAY_OUTPUT_CREATE;
+	output_create.base.length = sizeof output_create;
+	output_create.base.object_stamp = tdm_helper_get_time();
+	output_create.base.data = NULL;
+	output_create.base.sync = 1;
+	output_create.output = output;
+
+	ret = tdm_thread_cb_call(private_display, &output_create.base, 1);
+	TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
+
+	return TDM_ERROR_NONE;
+}
+
+INTERN void
+tdm_display_thread_cb_output_create(tdm_private_display *private_display, void *object, tdm_thread_cb_base *cb_base, void *user_data)
+{
+	tdm_thread_cb_display_output_create *output_create = (tdm_thread_cb_display_output_create*)cb_base;
+	tdm_private_output_create_handler *create_handler = user_data;
+	TDM_RETURN_IF_FAIL(TDM_MUTEX_IS_LOCKED());
+
+	assert(create_handler->owner_tid == syscall(SYS_gettid));
+
+	_pthread_mutex_unlock(&private_display->lock);
+	create_handler->func(private_display, output_create->output, create_handler->user_data);
+	_pthread_mutex_lock(&private_display->lock);
+}
+
+EXTERN tdm_error
+tdm_display_add_output_create_handler(tdm_display *dpy,
+									  tdm_output_create_handler func,
+									  void *user_data)
+{
+	tdm_private_output_create_handler *create_handler = NULL;
+
+	DISPLAY_FUNC_ENTRY();
+
+	TDM_RETURN_VAL_IF_FAIL(func != NULL, TDM_ERROR_INVALID_PARAMETER);
+
+	_pthread_mutex_lock(&private_display->lock);
+
+	LIST_FOR_EACH_ENTRY(create_handler, &private_display->output_create_handler_list, link) {
+		if (create_handler->func == func && create_handler->user_data == user_data) {
+			TDM_ERR("can't add twice");
+			_pthread_mutex_unlock(&private_display->lock);
+			return TDM_ERROR_BAD_REQUEST;
+		}
+	}
+
+	create_handler = calloc(1, sizeof(tdm_private_output_create_handler));
+	if (!create_handler) {
+		TDM_ERR("failed: alloc memory");
+		_pthread_mutex_unlock(&private_display->lock);
+		return TDM_ERROR_OUT_OF_MEMORY;
+	}
+
+	ret = tdm_thread_cb_add(private_display, TDM_THREAD_CB_DISPLAY_OUTPUT_CREATE, NULL,
+							tdm_display_thread_cb_output_create, create_handler);
+	if (ret != TDM_ERROR_NONE) {
+		TDM_ERR("tdm_thread_cb_add failed");
+		free(create_handler);
+		_pthread_mutex_unlock(&private_display->lock);
+		return TDM_ERROR_OPERATION_FAILED;
+	}
+
+	create_handler->private_display = private_display;
+	create_handler->func = func;
+	create_handler->user_data = user_data;
+	create_handler->owner_tid = syscall(SYS_gettid);
+
+	LIST_ADDTAIL(&create_handler->link, &private_display->output_create_handler_list);
+
+	_pthread_mutex_unlock(&private_display->lock);
+
+	return ret;
+}
+
+EXTERN void
+tdm_display_remove_output_create_handler(tdm_display *dpy,
+										 tdm_output_create_handler func,
+										 void *user_data)
+{
+	tdm_private_display *private_display;
+	tdm_private_output_create_handler *create_handler = NULL, *hh = NULL;
+
+	TDM_RETURN_IF_FAIL(dpy != NULL);
+	TDM_RETURN_IF_FAIL(func != NULL);
+
+	private_display = (tdm_private_display*)dpy;
+
+	_pthread_mutex_lock(&private_display->lock);
+
+	LIST_FOR_EACH_ENTRY_SAFE(create_handler, hh, &private_display->output_create_handler_list, link) {
+		if (create_handler->func != func || create_handler->user_data != user_data)
+			continue;
+
+		tdm_thread_cb_remove(private_display, TDM_THREAD_CB_DISPLAY_OUTPUT_CREATE, NULL,
+							 tdm_display_thread_cb_output_create, create_handler);
+
+		LIST_DEL(&create_handler->link);
+		free(create_handler);
+
+		_pthread_mutex_unlock(&private_display->lock);
+
+		return;
+	}
+
+	_pthread_mutex_unlock(&private_display->lock);
+}
+
 EXTERN tdm_error
 tdm_display_get_capabilities(tdm_display *dpy,
 							 tdm_display_capability *capabilities)
@@ -687,6 +805,15 @@ tdm_display_find_output(tdm_display *dpy, const char *name, tdm_error *error)
 		}
 	}
 
+	if (private_display->virtual_module) {
+		private_module = private_display->virtual_module;
+		LIST_FOR_EACH_ENTRY(private_output, &private_module->output_list, link) {
+			if (strncmp(private_output->name, name, TDM_NAME_LEN))
+				continue;
+			_pthread_mutex_unlock(&private_display->lock);
+			return private_output;
+		}
+	}
 	_pthread_mutex_unlock(&private_display->lock);
 
 	return NULL;
@@ -850,6 +977,9 @@ tdm_module_check_abi(tdm_private_module *private_module, int abimaj, int abimin)
 {
 	tdm_backend_module *module = private_module->module_data;
 
+	if (TDM_BACKEND_GET_ABI_MAJOR(module->abi_version) > abimaj)
+		return 1;
+
 	if (TDM_BACKEND_GET_ABI_MAJOR(module->abi_version) < abimaj)
 		return 0;
 
@@ -859,3 +989,118 @@ tdm_module_check_abi(tdm_private_module *private_module, int abimaj, int abimin)
 	return 1;
 }
 
+INTERN tdm_voutput *
+tdm_display_voutput_create(tdm_display *dpy, const char *name, tdm_error *error)
+{
+	tdm_private_module *private_module = NULL;
+	tdm_private_module *current_module = NULL;
+	tdm_private_voutput *private_voutput = NULL;
+	tdm_private_output *private_output = NULL;
+	tdm_func_display *func_display = NULL;
+	tdm_func_voutput *func_voutput = NULL;
+	tdm_voutput *voutput_backend = NULL;
+	tdm_output *output_backend = NULL;
+	int output_find = 0;
+	tdm_private_display *private_display;
+	tdm_error ret = TDM_ERROR_NONE;
+
+	TDM_RETURN_VAL_IF_FAIL_WITH_ERROR(dpy != NULL, TDM_ERROR_INVALID_PARAMETER, NULL);
+	private_display = (tdm_private_display*)dpy;
+	private_module = private_display->virtual_module;
+	TDM_RETURN_VAL_IF_FAIL_WITH_ERROR(private_module != NULL, TDM_ERROR_BAD_MODULE, NULL);
+
+	_pthread_mutex_lock(&private_display->lock);
+
+	if (error) *error = TDM_ERROR_NONE;
+
+	private_voutput = calloc(1, sizeof(tdm_private_voutput));
+	if (!private_voutput) {
+		if (error) *error = TDM_ERROR_OUT_OF_MEMORY;
+		_pthread_mutex_unlock(&private_display->lock);
+		return NULL;
+	}
+
+	func_display = &private_module->func_display;
+	func_voutput = &private_module->func_voutput;
+	current_module = private_display->current_module;
+	private_display->current_module = private_module;
+
+	voutput_backend = func_display->display_voutput_create(private_module->bdata, name, &ret);
+
+	if (voutput_backend == NULL || ret != TDM_ERROR_NONE) {
+		TDM_ERR("display_voutput_create fail");
+		free(private_voutput);
+		if (error) *error = ret;
+		private_display->current_module = current_module;
+		_pthread_mutex_unlock(&private_display->lock);
+		return NULL;
+	}
+	private_voutput->voutput_backend = voutput_backend;
+	private_voutput->private_display = private_display;
+	private_voutput->private_module = private_module;
+	LIST_INITHEAD(&private_voutput->voutput_commit_handler_list);
+
+	output_backend = func_voutput->voutput_get_output(voutput_backend, &ret);
+	if (output_backend == NULL || ret != TDM_ERROR_NONE) {
+		TDM_ERR("voutput_get_output fail");
+		free(private_voutput);
+		if (error) *error = ret;
+		if (func_voutput->voutput_destroy)
+			func_voutput->voutput_destroy(voutput_backend);
+		else
+			TDM_ERR("no destroy function");
+		private_display->current_module = current_module;
+		_pthread_mutex_unlock(&private_display->lock);
+		return NULL;
+	}
+
+	ret = tdm_display_update_output(private_display->current_module, output_backend);
+	if (ret != TDM_ERROR_NONE) {
+		TDM_ERR("tdm_display_update_output fail");
+		free(private_voutput);
+		if (func_voutput->voutput_destroy)
+			func_voutput->voutput_destroy(voutput_backend);
+		else
+			TDM_ERR("no destroy function");
+		if (error) *error = ret;
+		private_display->current_module = current_module;
+		_pthread_mutex_unlock(&private_display->lock);
+		return NULL;
+	}
+
+	LIST_FOR_EACH_ENTRY(private_output, &private_module->output_list, link) {
+		if (private_output->output_backend == output_backend) {
+			output_find = 1;
+			break;
+		}
+	}
+
+	if (output_find != 1) {
+		private_output = NULL;
+		free(private_voutput);
+		if (func_voutput->voutput_destroy)
+			func_voutput->voutput_destroy(voutput_backend);
+		else
+			TDM_ERR("no destroy function");
+		private_voutput = NULL;
+	} else {
+		strncpy(private_voutput->name, name, TDM_NAME_LEN - 1);
+		private_voutput->name[TDM_NAME_LEN - 1] = '\0';
+		strncpy(private_output->name, name, TDM_NAME_LEN - 1);
+		private_output->name[TDM_NAME_LEN - 1] = '\0';
+
+		private_voutput->private_output = private_output;
+		private_output->private_voutput = private_voutput;
+
+		/* do not use vblank */
+		tdm_output_choose_commit_per_vblank_mode(private_output, 0);
+
+		LIST_ADDTAIL(&private_voutput->link, &private_module->voutput_list);
+	}
+
+	private_display->current_module = current_module;
+
+	_pthread_mutex_unlock(&private_display->lock);
+
+	return private_voutput;
+}