output_data->dummy_data = dummy_data;
output_data->pipe = 0;
output_data->connector_type = TDM_OUTPUT_TYPE_Unknown;
- output_data->status = TDM_OUTPUT_CONN_STATUS_CONNECTED;
+ output_data->status = TDM_OUTPUT_CONN_STATUS_DISCONNECTED;
output_data->output_mode = calloc(1, sizeof(tdm_output_mode));
if (!output_data->output_mode) {
const char *tdm_debug_mutex_lock_func;
int tdm_debug_mutex_lock_line;
+static tdm_error _tdm_display_load_module_with_file(tdm_private_display *private_display, const char *file);
+
/* LCOV_EXCL_START */
static tdm_private_layer *
_tdm_display_find_private_layer(tdm_private_output *private_output,
return NULL;
}
+INTERN unsigned int
+tdm_display_find_empty_output_pipe(tdm_private_display *private_display)
+{
+ tdm_private_module *private_module = NULL;
+ tdm_private_output *private_output = NULL;
+ unsigned int pipe = 0;
+ while(1) {
+ int found = 0;
+ LIST_FOR_EACH_ENTRY(private_module, &private_display->module_list, link) {
+ LIST_FOR_EACH_ENTRY(private_output, &private_module->output_list, link) {
+ if (private_output->pipe == pipe) {
+ found = 1;
+ break;
+ }
+ }
+ if (found)
+ break;
+ }
+
+ if (!found)
+ break;
+ else
+ pipe++;
+ }
+
+ return pipe;
+}
+
INTERN void *
tdm_display_find_output_stamp(tdm_private_display *private_display, double stamp)
{
free(private_layer);
}
-static void
-_tdm_display_destroy_private_output(tdm_private_output *private_output)
+INTERN void
+tdm_display_destroy_private_output(tdm_private_output *private_output)
{
tdm_private_display *private_display = private_output->private_display;
tdm_private_layer *l = NULL, *ll = NULL;
tdm_private_hwc_commit_handler *hm = NULL, *hmm = NULL;
tdm_private_layer_commit_handler *lm = NULL, *lmm = NULL;
tdm_private_output_change_handler *h = NULL, *hh = NULL;
+ tdm_private_output_destroy_handler *dh = NULL, *dhh = NULL;
+ tdm_error ret;
+
+ ret = tdm_output_call_thread_cb_destroy(private_output);
+ TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
free(private_output->layers_ptr);
free(h);
}
+ LIST_FOR_EACH_ENTRY_SAFE(dh, dhh, &private_output->destroy_handler_list, link) {
+ LIST_DEL(&dh->link);
+ tdm_thread_cb_remove(dh->private_output, TDM_THREAD_CB_OUTPUT_DESTROY, NULL, tdm_output_thread_cb_destroy, dh);
+ free(dh);
+ }
+
if (private_output->vblank) {
/* tdm_vblank APIs is for server. it should be called in unlock status*/
_pthread_mutex_unlock(&private_display->lock);
tdm_private_module *private_module = NULL, *bb = NULL;
tdm_private_output *o = NULL, *oo = NULL;
tdm_private_pp *p = NULL, *pp = NULL;
+ tdm_private_output_create_handler *ch = NULL, *chh = NULL;
LIST_FOR_EACH_ENTRY_SAFE(private_module, bb, &private_display->module_list, link) {
LIST_FOR_EACH_ENTRY_SAFE(p, pp, &private_module->pp_list, link) {
}
LIST_FOR_EACH_ENTRY_SAFE(o, oo, &private_module->output_list, link) {
- _tdm_display_destroy_private_output(o);
+ tdm_display_destroy_private_output(o);
}
_tdm_display_destroy_caps_pp(&private_module->caps_pp);
private_module->outputs = NULL;
}
}
+
+ LIST_FOR_EACH_ENTRY_SAFE(ch, chh, &private_display->output_create_handler_list, link) {
+ LIST_DEL(&ch->link);
+ tdm_thread_cb_remove(ch->private_display, TDM_THREAD_CB_DISPLAY_OUTPUT_CREATE, NULL,
+ tdm_display_thread_cb_output_create, ch);
+ free(ch);
+ }
}
static tdm_error
tdm_error ret;
double stamp;
- if (!func_output->output_get_capability) {
- TDM_ERR("backend(%s) no output_get_capability()", private_module->module_data->name);
- return TDM_ERROR_BAD_MODULE;
- }
-
stamp = tdm_helper_get_time();
ret = func_output->output_get_capability(output_backend, caps);
TDM_DBG("backend(%s) backend output_get_capability() time: %.3f ms",
}
INTERN tdm_error
-tdm_display_update_output(tdm_private_module *private_module,
- tdm_output *output_backend, int pipe, unsigned int need_new_caps)
+tdm_display_update_output(tdm_private_module *private_module, tdm_output *output_backend)
{
tdm_func_output *func_output = &private_module->func_output;
+ tdm_private_display *private_display = NULL;
tdm_private_output *private_output = NULL;
tdm_layer **layers = NULL;
tdm_private_hwc *private_hwc = NULL;
tdm_hwc *hwc;
int layer_count = 0, i;
tdm_error ret;
+ unsigned int output_created = 0;
+
+ private_display = private_module->private_display;
- private_output = tdm_display_find_private_output(private_module->private_display, output_backend);
+ private_output = tdm_display_find_private_output(private_display, output_backend);
if (!private_output) {
+ unsigned int pipe = tdm_display_find_empty_output_pipe(private_display);
+
private_output = calloc(1, sizeof(tdm_private_output));
TDM_RETURN_VAL_IF_FAIL(private_output != NULL, TDM_ERROR_OUT_OF_MEMORY);
private_output->stamp = tdm_helper_get_time();
- while (tdm_display_find_output_stamp(private_module->private_display, private_output->stamp))
+ while (tdm_display_find_output_stamp(private_display, private_output->stamp))
private_output->stamp++;
LIST_ADDTAIL(&private_output->link, &private_module->output_list);
private_output->private_module = private_module;
- private_output->private_display = private_module->private_display;
+ private_output->private_display = private_display;
private_output->current_dpms_value = TDM_OUTPUT_DPMS_OFF;
private_output->output_backend = output_backend;
private_output->pipe = pipe;
LIST_INITHEAD(&private_output->vblank_handler_list);
LIST_INITHEAD(&private_output->output_commit_handler_list);
LIST_INITHEAD(&private_output->pending_commit_handler_list);
+ LIST_INITHEAD(&private_output->destroy_handler_list);
LIST_INITHEAD(&private_output->change_handler_list);
if (func_output->output_set_status_handler) {
private_output->regist_change_cb = 1;
}
- ret = _tdm_display_update_caps_output(private_module, pipe, output_backend, &private_output->caps);
+ output_created = 1;
+
+ /* NOTE that output modes will be allocated newly after here */
+ _tdm_display_destroy_caps_output(&private_output->caps);
+ ret = _tdm_display_update_caps_output(private_module, private_output->pipe, output_backend, &private_output->caps);
TDM_RETURN_VAL_IF_FAIL(ret == TDM_ERROR_NONE, ret);
if (private_output->caps.status == TDM_OUTPUT_CONN_STATUS_DISCONNECTED)
LIST_INITHEAD(&private_output->layer_commit_handler_list);
}
} else {
- /* need_new_caps will be true only in case of "disconnected -> connected" and "connected -> disconnected"
- * because we have to get new modes.
- */
- if (need_new_caps) {
- _tdm_display_destroy_caps_output(&private_output->caps);
-
- ret = _tdm_display_update_caps_output(private_module, pipe, output_backend, &private_output->caps);
- TDM_RETURN_VAL_IF_FAIL(ret == TDM_ERROR_NONE, ret);
+ _tdm_display_destroy_caps_output(&private_output->caps);
+ ret = _tdm_display_update_caps_output(private_module, private_output->pipe, output_backend, &private_output->caps);
+ TDM_RETURN_VAL_IF_FAIL(ret == TDM_ERROR_NONE, ret);
- if (private_output->caps.status == TDM_OUTPUT_CONN_STATUS_DISCONNECTED)
- private_output->current_mode = NULL;
- }
+ if (private_output->caps.status == TDM_OUTPUT_CONN_STATUS_DISCONNECTED)
+ private_output->current_mode = NULL;
}
/* do not use the layer object when the tdm_output has the hwc capability */
free(layers);
}
+ if (output_created) {
+ ret = tdm_display_call_thread_cb_output_create(private_display, private_output);
+ TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
+ }
+
return TDM_ERROR_NONE;
}
outputs = func_display->display_get_outputs(private_module->bdata, &output_count, &ret);
if (ret != TDM_ERROR_NONE)
- goto failed_get_outputs;
+ goto no_output;
*count = output_count;
if (output_count == 0)
- goto failed_get_outputs;
+ goto no_output;
else if (output_count == 1) {
private_module->outputs = outputs;
return outputs;
ret = func_output->output_get_capability(outputs[i], &caps);
if (ret != TDM_ERROR_NONE) {
TDM_ERR("output_get_capability() failed");
- goto failed_get_outputs;
+ goto no_output;
}
if (caps.status == TDM_OUTPUT_CONN_STATUS_CONNECTED) {
return outputs;
-failed_get_outputs:
+no_output:
free(outputs);
*count = 0;
return NULL;
{
tdm_private_module *private_module = NULL;
tdm_error ret = TDM_ERROR_NONE;
- int index = 0;
+ int output_count = 0;
if (private_display->pp_module) {
ret = _tdm_display_update_caps_pp(private_display->pp_module,
LIST_FOR_EACH_ENTRY(private_module, &private_display->module_list, link) {
tdm_output **outputs;
- int output_count = 0, i;
+ int i, count = 0;
- outputs = _tdm_display_get_ordered_outputs(private_module, &output_count);
- if (!outputs)
- goto failed_update;
+ outputs = _tdm_display_get_ordered_outputs(private_module, &count);
+
+ if (count > 0)
+ TDM_GOTO_IF_FAIL(outputs != NULL, failed_update);
+
+ for (i = 0; i < count; i++) {
+ ret = tdm_display_update_output(private_module, outputs[i]);
+ if (ret != TDM_ERROR_NONE)
+ goto failed_update;
+ output_count++;
+ }
+ }
+
+ /* At least, the output count should be greater than 0 to ensure tdm_vblank works.
+ * So we will create a dummy output when backends don't have any output.
+ * Without destroying a tdm_output object, this dummy output will be replaced with
+ * a virtual output which is created in runtime.
+ */
+ if (output_count == 0) {
+ tdm_output **outputs;
+ int i, count = 0;
+
+ TDM_INFO("loading a %s backend", TDM_DUMMY_MODULE);
+ ret = _tdm_display_load_module_with_file(private_display, TDM_DUMMY_MODULE);
+ TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, failed_update);
+ TDM_GOTO_IF_FAIL(private_display->dummy_module != NULL, failed_update);
+
+ private_module = private_display->dummy_module;
- for (i = 0; i < output_count; i++) {
- ret = tdm_display_update_output(private_module, outputs[i], index++, 1);
+ outputs = _tdm_display_get_ordered_outputs(private_module, &count);
+ TDM_GOTO_IF_FAIL(count > 0, failed_update);
+ TDM_GOTO_IF_FAIL(outputs != NULL, failed_update);
+
+ for (i = 0; i < count; i++) {
+ ret = tdm_display_update_output(private_module, outputs[i]);
if (ret != TDM_ERROR_NONE)
goto failed_update;
}
private_display->current_module = NULL;
+ if (!strncmp(file, TDM_DUMMY_MODULE, TDM_NAME_LEN))
+ private_display->dummy_module = private_module;
+
private_module->bdata = bdata;
if (ret != TDM_ERROR_NONE) {
arg = strtok_r(NULL, TDM_CONFIG_DELIM, &end);
}
- /* load bufmgr priv from dummy lib */
- if (LIST_IS_EMPTY(&private_display->module_list)) {
- TDM_WRN("No backend. loading a %s backend", TDM_DUMMY_MODULE);
- ret = _tdm_display_load_module_with_file(private_display, TDM_DUMMY_MODULE);
- if (ret == TDM_ERROR_NONE)
- TDM_INFO("%s backend loading success", TDM_DUMMY_MODULE);
- else
- TDM_INFO("%s backend loading failed", TDM_DUMMY_MODULE);
- }
-
return ret;
}
}
/* LCOV_EXCL_STOP */
+INTERN void *
+tdm_display_find_stamp(tdm_private_display *private_display, double stamp)
+{
+ return (void*)g_private_display;
+}
+
EXTERN tdm_display *
tdm_display_init(tdm_error *error)
{
private_display->stamp = tdm_helper_get_time();
+ LIST_INITHEAD(&private_display->output_create_handler_list);
+
str = tdm_config_get_string(TDM_CONFIG_KEY_DEBUG_MODULE, NULL);
if (str)
tdm_display_enable_debug_module(str);
if (error)
*error = TDM_ERROR_NONE;
+ tdm_thread_cb_set_find_func(TDM_THREAD_CB_DISPLAY_OUTPUT_CREATE, tdm_display_find_stamp);
+
_pthread_mutex_unlock(&private_display->lock);
pthread_mutex_unlock(&gLock);
TDM_RETURN_VAL_IF_FAIL(dpy != NULL, TDM_ERROR_INVALID_PARAMETER); \
private_display = (tdm_private_display*)dpy;
+#define BACKEND_FUNC_ENTRY_VOID() \
+ tdm_private_display *private_display; \
+ TDM_RETURN_IF_FAIL(dpy != NULL); \
+ private_display = (tdm_private_display*)dpy;
+
static int
_check_abi_version(tdm_backend_module *module, int abimaj, int abimin)
{
return TDM_ERROR_NONE;
}
+
+EXTERN tdm_error
+tdm_backend_register_output(tdm_display *dpy, tdm_output *output)
+{
+ tdm_error ret;
+
+ BACKEND_FUNC_ENTRY();
+
+ TDM_RETURN_VAL_IF_FAIL(TDM_MUTEX_IS_LOCKED(), TDM_ERROR_OPERATION_FAILED);
+ TDM_RETURN_VAL_IF_FAIL(output != NULL, TDM_ERROR_OPERATION_FAILED);
+
+ /* this function is only for backend. if backend calls this function, it means
+ * that it's triggered by frontend. frontend should set current_module before calling
+ * backend functions.
+ */
+ TDM_RETURN_VAL_IF_FAIL(private_display->current_module != NULL, TDM_ERROR_OPERATION_FAILED);
+
+ ret = tdm_display_update_output(private_display->current_module, output);
+ TDM_RETURN_VAL_IF_FAIL(ret == TDM_ERROR_NONE, ret);
+
+ return TDM_ERROR_NONE;
+}
+
+EXTERN void
+tdm_backend_unregister_output(tdm_display *dpy, tdm_output *output)
+{
+ tdm_private_output *private_output;
+
+ BACKEND_FUNC_ENTRY_VOID();
+
+ TDM_RETURN_IF_FAIL(TDM_MUTEX_IS_LOCKED());
+ TDM_RETURN_IF_FAIL(output != NULL);
+
+ /* this function is only for backend. if backend calls this function, it means
+ * that it's triggered by frontend. frontend should set current_module before calling
+ * backend functions.
+ */
+ TDM_RETURN_IF_FAIL(private_display->current_module != NULL);
+
+ private_output = tdm_display_find_private_output(private_display, output);
+ tdm_display_destroy_private_output(private_output);
+}
TDM_RETURN_VAL_IF_FAIL_WITH_ERROR(dpy != NULL, TDM_ERROR_INVALID_PARAMETER, NULL); \
private_display = (tdm_private_display*)dpy;
+#define DISPLAY_FUNC_ENTRY_VOID() \
+ tdm_private_display *private_display; \
+ TDM_RETURN_IF_FAIL(dpy != NULL); \
+ TDM_RETURN_IF_FAIL(tdm_display_is_valid(dpy)); \
+ private_display = (tdm_private_display*)dpy;
+
+
#define BACKEND_FUNC_ENTRY() \
tdm_private_module *private_module; \
tdm_private_display *private_display; \
}
/* 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;
+
+ 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 = 0;
+ 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)
_tdm_event_loop_main_fd_handler(int fd, tdm_event_loop_mask mask, void *user_data)
{
tdm_private_module *private_module = (tdm_private_module*)user_data;
+ tdm_private_display *private_display;
tdm_func_display *func_display;
tdm_error ret;
if (!func_display->display_handle_events)
return TDM_ERROR_NONE;
+ private_display = private_module->private_display;
+ private_display->current_module = private_module;
ret = func_display->display_handle_events(private_module->bdata);
+ private_display->current_module = NULL;
return ret;
}
}
}
}
+ if (LIST_IS_EMPTY(&private_module->output_list))
+ TDM_SNPRINTF(reply, len, "(no output)\n");
TDM_SNPRINTF(reply, len, "\n");
/* layer information */
}
}
}
+ if (LIST_IS_EMPTY(&private_module->output_list))
+ TDM_SNPRINTF(reply, len, "(no layer)\n");
TDM_SNPRINTF(reply, len, "\n");
if (private_module->capabilities & TDM_DISPLAY_CAPABILITY_PP) {
return ret;
}
+tdm_error
+tdm_layer_get_own_buffer_queue(tdm_layer *layer, tbm_surface_queue_h *buffer_queue)
+{
+ LAYER_FUNC_ENTRY();
+
+ TDM_RETURN_VAL_IF_FAIL(buffer_queue != NULL, TDM_ERROR_INVALID_PARAMETER);
+
+ _pthread_mutex_lock(&private_display->lock);
+
+ _pthread_mutex_unlock(&private_display->lock);
+
+ return ret;
+}
+
EXTERN tdm_error
tdm_layer_unset_buffer_queue(tdm_layer *layer)
{
static struct tdm_type_name tdm_cb_type_names[] = {
{ TDM_THREAD_CB_NONE, "none" },
{ TDM_THREAD_CB_EXIT, "exit" },
+ { TDM_THREAD_CB_DISPLAY_OUTPUT_CREATE, "output-create" },
+ { TDM_THREAD_CB_OUTPUT_DESTROY, "output-destroy" },
{ TDM_THREAD_CB_OUTPUT_COMMIT, "output-commit" },
{ TDM_THREAD_CB_OUTPUT_VBLANK, "output-vblank" },
{ TDM_THREAD_CB_OUTPUT_STATUS, "output-status" },
private_output = (tdm_private_output*)output; \
private_display = private_output->private_display
+#define OUTPUT_FUNC_ENTRY_VOID() \
+ tdm_private_display *private_display; \
+ tdm_private_output *private_output; \
+ TDM_RETURN_IF_FAIL(tdm_output_is_valid(output)); \
+ private_output = (tdm_private_output*)output; \
+ private_display = private_output->private_display
+
static void
_tdm_output_vblank_timeout_update(tdm_private_output *private_output, int ms_delay);
INTERN tdm_error
tdm_output_init(tdm_private_display *private_display)
{
+ tdm_thread_cb_set_find_func(TDM_THREAD_CB_OUTPUT_DESTROY, tdm_display_find_output_stamp);
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_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;
+}
+
+INTERN tdm_error
+tdm_output_call_thread_cb_destroy(tdm_private_output *private_output)
+{
+ tdm_thread_cb_output_destroy output_destroy;
+ tdm_error ret;
+
+ memset(&output_destroy, 0, sizeof output_destroy);
+ output_destroy.base.type = TDM_THREAD_CB_OUTPUT_DESTROY;
+ output_destroy.base.length = sizeof output_destroy;
+ output_destroy.base.object_stamp = private_output->stamp;
+ output_destroy.base.data = NULL;
+ output_destroy.base.sync = 1;
+
+ ret = tdm_thread_cb_call(private_output, &output_destroy.base, 1);
+ TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
return TDM_ERROR_NONE;
}
+INTERN void
+tdm_output_thread_cb_destroy(tdm_private_display *private_display, void *object, tdm_thread_cb_base *cb_base, void *user_data)
+{
+ tdm_private_output *private_output = object;
+ tdm_private_output_destroy_handler *destroy_handler = user_data;
+
+ TDM_RETURN_IF_FAIL(TDM_MUTEX_IS_LOCKED());
+
+ assert(destroy_handler->owner_tid == syscall(SYS_gettid));
+
+ _pthread_mutex_unlock(&private_display->lock);
+ destroy_handler->func(private_output, destroy_handler->user_data);
+ _pthread_mutex_lock(&private_display->lock);
+}
+
+EXTERN tdm_error
+tdm_output_add_destroy_handler(tdm_output *output,
+ tdm_output_destroy_handler func,
+ void *user_data)
+{
+ tdm_private_output_destroy_handler *destroy_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(destroy_handler, &private_output->destroy_handler_list, link) {
+ if (destroy_handler->func == func && destroy_handler->user_data == user_data) {
+ TDM_ERR("can't add twice");
+ _pthread_mutex_unlock(&private_display->lock);
+ return TDM_ERROR_BAD_REQUEST;
+ }
+ }
+
+ destroy_handler = calloc(1, sizeof(tdm_private_output_destroy_handler));
+ if (!destroy_handler) {
+ TDM_ERR("failed: alloc memory");
+ _pthread_mutex_unlock(&private_display->lock);
+ return TDM_ERROR_OUT_OF_MEMORY;
+ }
+
+ ret = tdm_thread_cb_add(private_output, TDM_THREAD_CB_OUTPUT_DESTROY, NULL, tdm_output_thread_cb_destroy, destroy_handler);
+ if (ret != TDM_ERROR_NONE) {
+ TDM_ERR("tdm_thread_cb_add failed");
+ free(destroy_handler);
+ _pthread_mutex_unlock(&private_display->lock);
+ return TDM_ERROR_OPERATION_FAILED;
+ }
+
+ destroy_handler->private_output = private_output;
+ destroy_handler->func = func;
+ destroy_handler->user_data = user_data;
+ destroy_handler->owner_tid = syscall(SYS_gettid);
+
+ LIST_ADDTAIL(&destroy_handler->link, &private_output->destroy_handler_list);
+
+ _pthread_mutex_unlock(&private_display->lock);
+
+ return ret;
+}
+
+
+EXTERN void
+tdm_output_remove_destroy_handler(tdm_output *output,
+ tdm_output_destroy_handler func,
+ void *user_data)
+{
+ tdm_private_display *private_display;
+ tdm_private_output *private_output;
+ tdm_private_output_destroy_handler *destroy_handler = NULL, *hh = NULL;
+
+ TDM_RETURN_IF_FAIL(output != NULL);
+ TDM_RETURN_IF_FAIL(func != NULL);
+
+ private_output = (tdm_private_output*)output;
+ private_display = private_output->private_display;
+
+ _pthread_mutex_lock(&private_display->lock);
+
+ LIST_FOR_EACH_ENTRY_SAFE(destroy_handler, hh, &private_output->destroy_handler_list, link) {
+ if (destroy_handler->func != func || destroy_handler->user_data != user_data)
+ continue;
+
+ tdm_thread_cb_remove(private_output, TDM_THREAD_CB_OUTPUT_DESTROY, NULL, tdm_output_thread_cb_destroy, destroy_handler);
+
+ LIST_DEL(&destroy_handler->link);
+ free(destroy_handler);
+
+ _pthread_mutex_unlock(&private_display->lock);
+
+ return;
+ }
+
+ _pthread_mutex_unlock(&private_display->lock);
+}
+
EXTERN tdm_module *
tdm_output_get_backend_module(tdm_output *output, tdm_error *error)
{
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);
+ ret = tdm_display_update_output(private_output->private_module, output_backend);
TDM_RETURN_IF_FAIL(ret == TDM_ERROR_NONE);
} else {
private_output->caps.status = status;
int
tdm_module_check_abi(tdm_private_module *private_module, int abimaj, int abimin);
+tdm_error
+tdm_display_call_thread_cb_output_create(tdm_private_display *private_display, tdm_output *output);
+void
+tdm_display_thread_cb_output_create(tdm_private_display *private_display, void *object, tdm_thread_cb_base *cb_base, void *user_data);
void *
tdm_display_find_output_stamp(tdm_private_display *private_display, double stamp);
tdm_private_output *
tdm_display_find_private_output(tdm_private_display *private_display, tdm_output *output_backend);
+unsigned int
+tdm_display_find_empty_output_pipe(tdm_private_display *private_display);
+
void *
tdm_display_find_hwc_stamp(tdm_private_display *private_display, double stamp);
tdm_error
tdm_output_init(tdm_private_display *private_display);
+tdm_error
+tdm_output_call_thread_cb_destroy(tdm_private_output *private_output);
+void
+tdm_output_thread_cb_destroy(tdm_private_display *private_display, void *object, tdm_thread_cb_base *cb_base, void *user_data);
void
tdm_output_thread_cb_change(tdm_private_display *private_display, void *object, tdm_thread_cb_base *cb_base, void *user_data);
void
extern char *tdm_debug_dump_dir;
tdm_error
-tdm_display_update_output(tdm_private_module *private_module,
- tdm_output *output_backend, int pipe, unsigned int need_new_caps);
+tdm_display_update_output(tdm_private_module *private_module, tdm_output *output_backend);
+void
+tdm_display_destroy_private_output(tdm_private_output *private_output);
+
tdm_error
tdm_display_enable_debug_module(const char*modules);
tdm_error
typedef struct _tdm_private_loop tdm_private_loop;
typedef struct _tdm_private_server tdm_private_server;
typedef struct _tdm_private_thread tdm_private_thread;
+typedef struct _tdm_private_output_create_handler tdm_private_output_create_handler;
+typedef struct _tdm_private_output_destroy_handler tdm_private_output_destroy_handler;
typedef struct _tdm_private_output_change_handler tdm_private_output_change_handler;
typedef struct _tdm_private_output_commit_handler tdm_private_output_commit_handler;
typedef struct _tdm_private_output_vblank_handler tdm_private_output_vblank_handler;
#endif
struct list_head module_list;
+ tdm_private_module *dummy_module;
tdm_private_module *current_module; //setted only when loading
tdm_private_module *pp_module; //pp-support backend
tdm_private_module *capture_module; //TODO: remove later
/* for event handling */
tdm_private_loop *private_loop;
+ struct list_head output_create_handler_list;
+
int print_fps;
};
tdm_event_loop_source *vblank_timeout_timer;
unsigned int vblank_timeout_timer_expired;
+ struct list_head destroy_handler_list;
struct list_head change_handler_list;
void **layers_ptr;
pid_t owner_tid;
};
+struct _tdm_private_output_create_handler {
+ struct list_head link;
+
+ tdm_private_display *private_display;
+ tdm_output_create_handler func;
+ void *user_data;
+
+ pid_t owner_tid;
+};
+
+struct _tdm_private_output_destroy_handler {
+ struct list_head link;
+
+ tdm_private_output *private_output;
+ tdm_output_destroy_handler func;
+ void *user_data;
+
+ pid_t owner_tid;
+};
+
struct _tdm_private_output_change_handler {
struct list_head link;
typedef enum {
TDM_THREAD_CB_NONE,
TDM_THREAD_CB_EXIT, /* special type to exit the tdm-thread */
+ TDM_THREAD_CB_DISPLAY_OUTPUT_CREATE,
+ TDM_THREAD_CB_OUTPUT_DESTROY,
TDM_THREAD_CB_OUTPUT_COMMIT,
TDM_THREAD_CB_OUTPUT_VBLANK,
TDM_THREAD_CB_OUTPUT_STATUS,
} tdm_thread_cb_type;
typedef struct _tdm_thread_cb_base tdm_thread_cb_base;
+typedef struct _tdm_thread_cb_display_output_create tdm_thread_cb_display_output_create;
+typedef struct _tdm_thread_cb_output_destroy tdm_thread_cb_output_destroy;
typedef struct _tdm_thread_cb_output_vblank tdm_thread_cb_output_commit;
typedef struct _tdm_thread_cb_output_vblank tdm_thread_cb_output_vblank;
typedef struct _tdm_thread_cb_output_dpms tdm_thread_cb_output_dpms;
unsigned int sync;
};
+struct _tdm_thread_cb_display_output_create {
+ tdm_thread_cb_base base;
+ tdm_output *output;
+};
+
+struct _tdm_thread_cb_output_destroy {
+ tdm_thread_cb_base base;
+};
+
struct _tdm_thread_cb_output_vblank {
tdm_thread_cb_base base;
unsigned int sequence;
if (tdm_debug_module & TDM_DEBUG_THREAD)
TDM_INFO("type(%s), length(%d)", tdm_cb_type_str(base->type), base->length);
switch (base->type) {
+ case TDM_THREAD_CB_DISPLAY_OUTPUT_CREATE:
+ case TDM_THREAD_CB_OUTPUT_DESTROY:
case TDM_THREAD_CB_OUTPUT_COMMIT:
case TDM_THREAD_CB_OUTPUT_VBLANK:
case TDM_THREAD_CB_OUTPUT_STATUS:
projects / platform / core / uifw / libtdm.git / commitdiff