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;
}
}
- 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");
TDM_INFO("handler(%p)", voutput_commit_handler);
}
- if (voutput_commit_handler->func) {
+ if (voutput_commit_handler->func && private_voutput->set_voutput_commit != 0) {
_pthread_mutex_unlock(&private_display->lock);
voutput_commit_handler->func(private_voutput, voutput_commit_handler->user_data);
_pthread_mutex_lock(&private_display->lock);
{
tdm_private_voutput_commit_handler *voutput_commit_handler = NULL;
tdm_private_module *private_module;
- tdm_private_voutput *private_voutput = NULL, *v;
+ tdm_private_voutput *private_voutput = NULL, *v = NULL;
tdm_private_output *private_output;
tdm_thread_cb_voutput_commit voutput_commit;
tdm_error ret;
return;
}
- LIST_FOR_EACH_ENTRY(voutput_commit_handler, &private_voutput->voutput_commit_handler_list, link) {
- if (voutput_commit_handler) break;
- }
+ if (LIST_LENGTH(&private_voutput->voutput_commit_handler_list) == 0) return;
+
+ voutput_commit_handler = LIST_FIRST_ENTRY(&private_voutput->voutput_commit_handler_list, tdm_private_voutput_commit_handler, link);
private_output = private_voutput->private_output;
}
INTERN tdm_error
+tdm_output_set_voutput_commit(tdm_voutput *voutput)
+{
+ tdm_private_display *private_display;
+ tdm_private_output *private_output;
+ tdm_private_voutput *private_voutput;
+ tdm_private_voutput_commit_handler *voutput_commit_handler = NULL;
+ tdm_error ret = TDM_ERROR_NONE;
+
+ TDM_RETURN_VAL_IF_FAIL(voutput != NULL, TDM_ERROR_INVALID_PARAMETER);
+
+ private_voutput = (tdm_private_voutput *)voutput;
+ private_display = private_voutput->private_display;
+ private_output = (tdm_private_output *)private_voutput->private_output;
+
+ _pthread_mutex_lock(&private_display->lock);
+
+ if (LIST_LENGTH(&private_voutput->voutput_commit_handler_list) != 0) {
+ _pthread_mutex_unlock(&private_display->lock);
+ return ret;
+ }
+
+ if (!private_voutput->regist_commit_cb) {
+ private_voutput->regist_commit_cb = 1;
+ 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;
+ }
+ }
+
+ voutput_commit_handler = calloc(1, sizeof(tdm_private_voutput_commit_handler));
+ if (!voutput_commit_handler) {
+ /* LCOV_EXCL_START */
+ TDM_ERR("failed: alloc memory");
+ _pthread_mutex_unlock(&private_display->lock);
+ return TDM_ERROR_OUT_OF_MEMORY;
+ /* LCOV_EXCL_STOP */
+ }
+
+ ret = tdm_thread_cb_add(private_output->private_voutput, TDM_THREAD_CB_VOUTPUT_COMMIT, voutput_commit_handler, _tdm_voutput_thread_cb_commit, NULL);
+ if (ret != TDM_ERROR_NONE) {
+ TDM_ERR("tdm_thread_cb_add failed");
+ free(voutput_commit_handler);
+ _pthread_mutex_unlock(&private_display->lock);
+ return ret;
+ }
+
+ LIST_ADDTAIL(&voutput_commit_handler->link, &private_voutput->voutput_commit_handler_list);
+ voutput_commit_handler->private_voutput = private_voutput;
+ voutput_commit_handler->func = _voutput_commit_func;
+ voutput_commit_handler->owner_tid = syscall(SYS_gettid);
+
+ private_voutput->set_voutput_commit = 1;
+
+ _pthread_mutex_unlock(&private_display->lock);
+
+ return ret;
+}
+
+INTERN tdm_error
+tdm_output_unset_voutput_commit(tdm_voutput *voutput)
+{
+ tdm_private_display *private_display;
+ tdm_private_output *private_output;
+ tdm_private_voutput *private_voutput;
+ tdm_private_voutput_commit_handler *voutput_commit_handler = NULL;
+ tdm_error ret = TDM_ERROR_NONE;
+
+ TDM_RETURN_VAL_IF_FAIL(voutput != NULL, TDM_ERROR_INVALID_PARAMETER);
+
+ private_voutput = (tdm_private_voutput *)voutput;
+ private_display = private_voutput->private_display;
+ private_output = (tdm_private_output *)private_voutput->private_output;
+
+ _pthread_mutex_lock(&private_display->lock);
+
+ private_voutput->set_voutput_commit = 0;
+
+ if (private_voutput->regist_commit_cb) {
+ private_voutput->regist_commit_cb = 0;
+ ret = tdm_voutput_set_commit_func(private_voutput, NULL);
+ if (ret != TDM_ERROR_NONE) {
+ TDM_ERR("failed: tdm_voutput_set_commit_func");
+ _pthread_mutex_unlock(&private_display->lock);
+ return ret;
+ }
+ }
+
+ if (LIST_LENGTH(&private_voutput->voutput_commit_handler_list) == 0) {
+ _pthread_mutex_unlock(&private_display->lock);
+ return TDM_ERROR_NONE;
+ }
+
+ if (LIST_LENGTH(&private_output->output_commit_handler_list) != 0) {
+ //commiting. don't remove voutput commit thread here
+ _pthread_mutex_unlock(&private_display->lock);
+ return TDM_ERROR_NONE;
+ }
+
+ if (LIST_LENGTH(&private_voutput->voutput_commit_handler_list) != 0) {
+ voutput_commit_handler = LIST_FIRST_ENTRY(&private_voutput->voutput_commit_handler_list, tdm_private_voutput_commit_handler, link);
+ } else {
+ _pthread_mutex_unlock(&private_display->lock);
+ return TDM_ERROR_NONE;
+ }
+
+ tdm_thread_cb_remove(private_output->private_voutput, TDM_THREAD_CB_VOUTPUT_COMMIT, voutput_commit_handler, _tdm_voutput_thread_cb_commit, NULL);
+
+ _pthread_mutex_unlock(&private_display->lock);
+
+ return TDM_ERROR_NONE;
+}
+
+INTERN tdm_error
tdm_output_commit_internal(tdm_output *output, int sync, tdm_output_commit_handler func, void *user_data)
{
tdm_private_display *private_display;
free(output_commit_handler);
return TDM_ERROR_BAD_MODULE;
}
- private_voutput = private_output->private_voutput;
-
- if (!private_voutput->regist_commit_cb) {
- private_voutput->regist_commit_cb = 1;
- ret = tdm_voutput_set_commit_func(private_voutput, _tdm_voutput_cb_commit);
- TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, commit_failed);
- }
-
- voutput_commit_handler = calloc(1, sizeof(tdm_private_voutput_commit_handler));
- if (!voutput_commit_handler) {
- /* LCOV_EXCL_START */
- TDM_ERR("failed: alloc memory");
- free(output_commit_handler);
- return TDM_ERROR_OUT_OF_MEMORY;
- /* LCOV_EXCL_STOP */
- }
-
- ret = tdm_thread_cb_add(private_output->private_voutput, TDM_THREAD_CB_VOUTPUT_COMMIT, voutput_commit_handler, _tdm_voutput_thread_cb_commit, NULL);
- if (ret != TDM_ERROR_NONE) {
- TDM_ERR("tdm_thread_cb_add failed");
- free(voutput_commit_handler);
- free(output_commit_handler);
- return ret;
- }
}
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);
- if (voutput_commit_handler)
- free(voutput_commit_handler);
return ret;
}
output_commit_handler->user_data = user_data;
output_commit_handler->owner_tid = syscall(SYS_gettid);
- if (voutput_commit_handler) {
+ if (private_module == private_display->virtual_module) {
+ private_voutput = private_output->private_voutput;
+
/* voutput use only 1 layer */
- LIST_FOR_EACH_ENTRY(private_layer, &private_output->layer_list, link) {
- if (private_layer) break;
- }
+ private_layer = LIST_FIRST_ENTRY(&private_output->layer_list, tdm_private_layer, link);
- LIST_ADDTAIL(&voutput_commit_handler->link, &private_voutput->voutput_commit_handler_list);
- voutput_commit_handler->private_voutput = private_voutput;
- voutput_commit_handler->func = _voutput_commit_func;
- voutput_commit_handler->user_data = private_layer->commiting_buffer;
- voutput_commit_handler->owner_tid = syscall(SYS_gettid);
+ if (LIST_LENGTH(&private_voutput->voutput_commit_handler_list) != 0) {
+ voutput_commit_handler = LIST_FIRST_ENTRY(&private_voutput->voutput_commit_handler_list, tdm_private_voutput_commit_handler, link);
+ voutput_commit_handler->user_data = private_layer->commiting_buffer;
+ }
}
ret = func_output->output_commit(private_output->output_backend, sync,
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;
LIST_DEL(&output_commit_handler->link);
free(output_commit_handler);
}
- if (voutput_commit_handler) {
- tdm_thread_cb_remove(private_output->private_voutput, TDM_THREAD_CB_VOUTPUT_COMMIT, voutput_commit_handler, _tdm_voutput_thread_cb_commit, NULL);
- LIST_DEL(&voutput_commit_handler->link);
- free(voutput_commit_handler);
- }
+
return ret;
/* LCOV_EXCL_STOP */
}
{
tdm_private_module *private_module;
tdm_func_output *func_output;
+ int sync = 0;
OUTPUT_FUNC_ENTRY();
if (!(private_output->caps.capabilities & TDM_OUTPUT_CAPABILITY_ASYNC_DPMS)) {
TDM_INFO("output(%d) dpms async '%s'", private_output->pipe, tdm_dpms_str(dpms_value));
- ret = func_output->output_set_dpms_async(private_output->output_backend, dpms_value);
+ ret = func_output->output_set_dpms_async(private_output->output_backend, dpms_value, &sync);
if (ret == TDM_ERROR_NONE) {
- private_output->waiting_dpms_change = 1;
- TDM_INFO("output(%d) dpms async '%s' waiting", private_output->pipe, tdm_dpms_str(dpms_value));
+ if (sync) {
+ tdm_output_dpms temp = TDM_OUTPUT_DPMS_OFF;
+
+ tdm_output_get_dpms_internal(output, &temp);
+ TDM_INFO("output(%d) dpms async '%s'(%s) done", private_output->pipe, tdm_dpms_str(dpms_value), tdm_dpms_str(temp));
+ } else {
+ private_output->waiting_dpms_change = 1;
+ TDM_INFO("output(%d) dpms async '%s' waiting", private_output->pipe, tdm_dpms_str(dpms_value));
+ }
} else {
tdm_output_dpms temp = TDM_OUTPUT_DPMS_OFF;
return private_hwc;
}
-INTERN tdm_error
-tdm_output_choose_commit_per_vblank_mode(tdm_private_output *private_output, int mode)
+EXTERN tdm_error
+tdm_output_set_mirror(tdm_output *output, tdm_output *src_output, tdm_transform transform)
{
- if (!private_output)
- return TDM_ERROR_INVALID_PARAMETER;
+ /* LCOV_EXCL_START */
+ tdm_private_module *private_module;
+ tdm_func_output *func_output;
+ tdm_private_output *private_src_output;
- if (mode < 0 || mode > 2)
- return TDM_ERROR_INVALID_PARAMETER;
+ OUTPUT_FUNC_ENTRY();
- private_output->commit_per_vblank = mode;
+ TDM_RETURN_VAL_IF_FAIL(src_output != NULL, TDM_ERROR_INVALID_PARAMETER);
- if (private_output->commit_per_vblank == 0)
- TDM_INFO("commit per vblank: disable");
- else if (private_output->commit_per_vblank == 1)
- TDM_INFO("commit per vblank: enable (1 layer)");
- else if (private_output->commit_per_vblank == 2)
- TDM_INFO("commit per vblank: enable (previous commit)");
+ _pthread_mutex_lock(&private_display->lock);
- return TDM_ERROR_NONE;
+ 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);
+
+ return ret;
+ /* LCOV_EXCL_STOP */
}
-INTERN tdm_voutput *
-tdm_voutput_create(tdm_display *dpy, const char *name, tdm_error *error)
+tdm_error
+tdm_output_unset_mirror(tdm_output *output)
{
- 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;
+ /* LCOV_EXCL_START */
+ tdm_private_module *private_module;
+ tdm_func_output *func_output;
- 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);
+ OUTPUT_FUNC_ENTRY();
_pthread_mutex_lock(&private_display->lock);
- if (error)
- *error = TDM_ERROR_NONE;
+ private_module = private_output->private_module;
+ func_output = &private_module->func_output;
- private_voutput = calloc(1, sizeof(tdm_private_voutput));
- if (!private_voutput) {
- *error = TDM_ERROR_OUT_OF_MEMORY;
+ 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 NULL;
+ return TDM_ERROR_BAD_REQUEST;
}
- 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->voutput_create(private_module->bdata, name, &ret);
-
- if (voutput_backend == NULL || ret != TDM_ERROR_NONE) {
- TDM_ERR("voutput_create fail");
- free(private_voutput);
- *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);
- *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;
+ if (!func_output->output_unset_mirror) {
+ TDM_WRN("not implemented!!");
_pthread_mutex_unlock(&private_display->lock);
- return NULL;
+ return TDM_ERROR_NOT_IMPLEMENTED;
}
- ret = tdm_display_update_output(private_display->current_module, output_backend);
+ ret = func_output->output_unset_mirror(private_output->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");
- *error = ret;
- private_display->current_module = current_module;
+ TDM_ERR("output(%p) fails to unset MIRROR.", private_output);
_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;
- }
+ return TDM_ERROR_BAD_REQUEST;
}
- 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");
- } else {
- strncpy(private_voutput->name, name, TDM_NAME_LEN);
- strncpy(private_output->name, name, TDM_NAME_LEN);
+ _pthread_mutex_unlock(&private_display->lock);
- private_voutput->private_output = private_output;
- private_output->private_voutput = private_voutput;
+ return ret;
+ /* LCOV_EXCL_STOP */
+}
- /* do not use vblank */
- tdm_output_choose_commit_per_vblank_mode(private_output, 0);
+INTERN tdm_error
+tdm_output_choose_commit_per_vblank_mode(tdm_private_output *private_output, int mode)
+{
+ if (!private_output)
+ return TDM_ERROR_INVALID_PARAMETER;
- LIST_ADDTAIL(&private_voutput->link, &private_module->voutput_list);
- }
+ if (mode < 0 || mode > 2)
+ return TDM_ERROR_INVALID_PARAMETER;
- private_display->current_module = current_module;
+ private_output->commit_per_vblank = mode;
- _pthread_mutex_unlock(&private_display->lock);
+ if (private_output->commit_per_vblank == 0)
+ TDM_INFO("commit per vblank: disable");
+ else if (private_output->commit_per_vblank == 1)
+ TDM_INFO("commit per vblank: enable (1 layer)");
+ else if (private_output->commit_per_vblank == 2)
+ TDM_INFO("commit per vblank: enable (previous commit)");
- return private_voutput;
+ return TDM_ERROR_NONE;
}
INTERN tdm_error
projects / platform / core / uifw / libtdm.git / blobdiff