* 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
tdm_private_display *private_display; \
tdm_private_output *private_output; \
tdm_error ret = TDM_ERROR_NONE; /* default TDM_ERROR_NONE */\
- TDM_RETURN_VAL_IF_FAIL(tdm_output_is_valid(output), TDM_ERROR_INVALID_PARAMETER); \
+ TDM_RETURN_VAL_IF_FAIL(output != NULL, TDM_ERROR_INVALID_PARAMETER); \
private_output = (tdm_private_output*)output; \
private_display = private_output->private_display
tdm_private_display *private_display; \
tdm_private_output *private_output; \
tdm_error ret = TDM_ERROR_NONE; /* default TDM_ERROR_NONE */\
- TDM_RETURN_VAL_IF_FAIL_WITH_ERROR(tdm_output_is_valid(output), TDM_ERROR_INVALID_PARAMETER, NULL); \
+ TDM_RETURN_VAL_IF_FAIL_WITH_ERROR(output != NULL, TDM_ERROR_INVALID_PARAMETER, NULL); \
private_output = (tdm_private_output*)output; \
private_display = private_output->private_display
TDM_RETURN_VAL_IF_FAIL(private_output != NULL, TDM_ERROR_OPERATION_FAILED);
- TDM_ERR("TDM output(%d) vblank TIMEOUT!!", private_output->pipe);
+ private_output->vblank_timeout_timer_expired++;
+
+ TDM_ERR("TDM output(%d) vblank TIMEOUT!! (%d time%s)",
+ private_output->pipe,
+ private_output->vblank_timeout_timer_expired,
+ (private_output->vblank_timeout_timer_expired > 1) ? "s" : "");
LIST_FOR_EACH_ENTRY(v, &private_output->vblank_handler_list, link) {
TDM_ERR("vblank_handler(%p) interval(%d) sync(%d) sent_to_frontend(%u) owner_tid(%d)",
return;
}
TDM_INFO("output(%d) create vblank timeout timer", private_output->pipe);
+ private_output->vblank_timeout_timer_expired = 0;
}
ret = tdm_event_loop_source_timer_update(private_output->vblank_timeout_timer, ms_delay);
{
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
return ret;
}
-/* LCOV_EXCL_START */
-static void
-_tdm_output_update(tdm_output *output_backend, void *user_data)
-{
- tdm_private_output *private_output = user_data;
- tdm_error ret;
-
- TDM_RETURN_IF_FAIL(private_output);
-
- ret = tdm_display_update_output(private_output->private_backend, output_backend, private_output->pipe);
- TDM_RETURN_IF_FAIL(ret == TDM_ERROR_NONE);
-}
-/* LCOV_EXCL_STOP */
-
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_change(tdm_private_output *private_output, tdm_output_change_type type, tdm_value value)
+_tdm_output_call_thread_cb_status(tdm_private_output *private_output, tdm_output_conn_status status)
{
- tdm_thread_cb_output_change output_change;
+ tdm_thread_cb_output_status output_status;
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_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_change.base);
+ 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_dpms(tdm_private_output *private_output, tdm_output_dpms dpms)
+{
+ tdm_thread_cb_output_dpms output_dpms;
+ tdm_error ret;
+
+ 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_dpms.base, 1);
TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
return TDM_ERROR_NONE;
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_INFO("output(%d) main %s", private_output->pipe, tdm_status_str(status));
+ TDM_RETURN_IF_FAIL(private_output);
- _tdm_output_update(output_backend, user_data);
+ TDM_INFO("output(%d) %s", private_output->pipe, tdm_status_str(status));
- value.u32 = 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_module, output_backend, private_output->pipe, 1);
+ TDM_RETURN_IF_FAIL(ret == TDM_ERROR_NONE);
+ } else {
+ private_output->caps.status = 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);
}
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));
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);
}
tdm_output_change_handler func,
void *user_data)
{
- tdm_private_output_change_handler *change_handler;
+ tdm_private_output_change_handler *change_handler = NULL;
OUTPUT_FUNC_ENTRY();
TDM_RETURN_VAL_IF_FAIL(func != NULL, TDM_ERROR_INVALID_PARAMETER);
_pthread_mutex_lock(&private_display->lock);
+ LIST_FOR_EACH_ENTRY(change_handler, &private_output->change_handler_list, link) {
+ if (change_handler->func == func && change_handler->user_data == user_data) {
+ TDM_ERR("can't add twice");
+ _pthread_mutex_unlock(&private_display->lock);
+ return TDM_ERROR_BAD_REQUEST;
+ }
+ }
+
change_handler = calloc(1, sizeof(tdm_private_output_change_handler));
if (!change_handler) {
/* LCOV_EXCL_START */
/* 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");
/* 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;
tdm_private_output *private_output;
tdm_private_output_change_handler *change_handler = NULL, *hh = NULL;
- TDM_RETURN_IF_FAIL(tdm_output_is_valid(output));
+ TDM_RETURN_IF_FAIL(output != NULL);
TDM_RETURN_IF_FAIL(func != NULL);
private_output = (tdm_private_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);
_pthread_mutex_lock(&private_display->lock);
- if (!tdm_backend_check_module_abi(private_output->private_backend, 1, 5)) {
-
- if (min_w)
- *min_w = -1;
- if (min_h)
- *min_h = -1;
- if (max_w)
- *max_w = -1;
- if (max_h)
- *max_h = -1;
- if (preferred_align)
- *preferred_align = -1;
-
+ if (!tdm_module_check_abi(private_output->private_module, 1, 5)) {
_pthread_mutex_unlock(&private_display->lock);
-
- return TDM_ERROR_BAD_MODULE;
+ return TDM_ERROR_BAD_REQUEST;
}
if (min_w)
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 */
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();
_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 */
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);
}
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);
}
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)
tdm_output_vblank_handler func, void *user_data)
{
OUTPUT_FUNC_ENTRY();
+ TDM_RETURN_VAL_IF_FAIL(interval > 0, TDM_ERROR_INVALID_PARAMETER);
_pthread_mutex_lock(&private_display->lock);
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;
tdm_output_dpms dpms_value = TDM_OUTPUT_DPMS_ON;
tdm_error ret = TDM_ERROR_NONE;
- TDM_RETURN_VAL_IF_FAIL(tdm_output_is_valid(output), TDM_ERROR_INVALID_PARAMETER);
+ TDM_RETURN_VAL_IF_FAIL(output != NULL, 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 */
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);
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)
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();
_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 */
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();
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));
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;
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();
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);
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;
- TDM_RETURN_VAL_IF_FAIL(tdm_output_is_valid(output), TDM_ERROR_INVALID_PARAMETER);
+ TDM_RETURN_VAL_IF_FAIL(output != NULL, TDM_ERROR_INVALID_PARAMETER);
private_output = (tdm_private_output*)output;
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 */
/* 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;
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)
{
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;
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 */
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;
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 */
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();
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 */
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;
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 */
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();
/* 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 */
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();
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 */
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;
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 */
if (ret != TDM_ERROR_NONE) {
/* LCOV_EXCL_START */
TDM_ERR("failed: layer set info(window)");
+ _pthread_mutex_unlock(&private_display->lock);
/* LCOV_EXCL_STOP */
return ret;
}
if (ret != TDM_ERROR_NONE) {
/* LCOV_EXCL_START */
TDM_ERR("failed: layer set info(window)");
+ _pthread_mutex_unlock(&private_display->lock);
/* LCOV_EXCL_STOP */
return ret;
}
if (!output_hwc_target_buffer_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 */
}
output_hwc_target_buffer_commit_handler->func = func;
output_hwc_target_buffer_commit_handler->user_data = user_data;
- ret = tdm_layer_commit_internal(private_layer, _tdm_output_hwc_layer_commit_handler, user_data);
+ ret = tdm_layer_commit_internal(private_layer, _tdm_output_hwc_layer_commit_handler, output_hwc_target_buffer_commit_handler);
if (ret != TDM_ERROR_NONE) {
/* LCOV_EXCL_START */
TDM_ERR("failed: commit layer(target buffer)");
free(output_hwc_target_buffer_commit_handler);
+ _pthread_mutex_unlock(&private_display->lock);
/* LCOV_EXCL_STOP */
return ret;
}
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();
_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 */
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;
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);
projects / platform / core / uifw / libtdm.git / blobdiff