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)
{
return NULL;
}
+INTERN void *
+tdm_display_find_private_voutput(tdm_private_display *private_display, double stamp)
+{
+ tdm_private_module *private_module = NULL;
+ tdm_private_voutput *private_voutput = NULL;
+ tdm_private_output *private_output = NULL;
+
+ private_module = private_display->virtual_module;
+ if (!private_module) return NULL;
+
+ LIST_FOR_EACH_ENTRY(private_voutput, &private_module->voutput_list, link) {
+ if (!private_voutput->private_output) continue;
+ private_output = private_voutput->private_output;
+ if (private_output->stamp == stamp)
+ return private_voutput;
+ }
+
+ return NULL;
+}
+
tdm_private_hwc *
tdm_display_find_private_hwc(tdm_private_display *private_display, tdm_hwc *hwc_backend)
{
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;
+ int mutex_locked = 0;
+
+ 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 (tdm_thread_is_running() && TDM_MUTEX_IS_LOCKED()) mutex_locked = 1;
if (private_output->vblank) {
/* tdm_vblank APIs is for server. it should be called in unlock status*/
- _pthread_mutex_unlock(&private_display->lock);
+ if (mutex_locked) _pthread_mutex_unlock(&private_display->lock);
tdm_vblank_destroy(private_output->vblank);
- _pthread_mutex_lock(&private_display->lock);
+ if (mutex_locked) _pthread_mutex_lock(&private_display->lock);
}
if (private_output->ttrace_vblank) {
/* tdm_vblank APIs is for server. it should be called in unlock status*/
- _pthread_mutex_unlock(&private_display->lock);
+ if (mutex_locked) _pthread_mutex_unlock(&private_display->lock);
tdm_vblank_destroy(private_output->ttrace_vblank);
- _pthread_mutex_lock(&private_display->lock);
+ if (mutex_locked) _pthread_mutex_lock(&private_display->lock);
}
LIST_FOR_EACH_ENTRY_SAFE(c, cc, &private_output->capture_list, link)
private_hwc = private_output->private_hwc;
LIST_FOR_EACH_ENTRY_SAFE(hw, hww, &private_hwc->hwc_window_list, link)
tdm_hwc_window_destroy_internal(hw);
+ if (private_hwc->display_target_buffer)
+ tbm_surface_internal_unref(private_hwc->display_target_buffer);
free(private_hwc);
} else {
LIST_FOR_EACH_ENTRY_SAFE(l, ll, &private_output->layer_list, link)
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);
+ LIST_INITHEAD(&private_output->mode_change_request_handler_list);
if (func_output->output_set_status_handler) {
func_output->output_set_status_handler(private_output->output_backend,
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;
+ int virtual = 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);
- for (i = 0; i < output_count; i++) {
- ret = tdm_display_update_output(private_module, outputs[i], index++, 1);
+ private_module = private_display->dummy_module;
+
+ 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;
}
}
+ virtual = tdm_config_get_int(TDM_CONFIG_KEY_GENERAL_VIRTUAL_OUTPUT, 0);
+ if (virtual) {
+ TDM_INFO("loading a %s backend", TDM_VIRTUAL_MODULE);
+ ret = _tdm_display_load_module_with_file(private_display, TDM_VIRTUAL_MODULE);
+ TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, failed_update);
+ TDM_GOTO_IF_FAIL(private_display->virtual_module != NULL, failed_update);
+ }
+
return TDM_ERROR_NONE;
failed_update:
if (!module) {
TDM_ERR("%s", dlerror());
TDM_TRACE_END();
- ret = TDM_ERROR_BAD_MODULE;
+ ret = TDM_ERROR_NO_MODULE;
goto failed_load;
}
private_display->current_module = NULL;
+ if (!strncmp(file, TDM_DUMMY_MODULE, TDM_NAME_LEN))
+ private_display->dummy_module = private_module;
+
+ if (!strncmp(file, TDM_VIRTUAL_MODULE, TDM_NAME_LEN))
+ private_display->virtual_module = private_module;
+
private_module->bdata = bdata;
if (ret != TDM_ERROR_NONE) {
}
LIST_INITHEAD(&private_module->output_list);
+ LIST_INITHEAD(&private_module->voutput_list);
LIST_INITHEAD(&private_module->pp_list);
LIST_INITHEAD(&private_module->capture_list);
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);
goto failed_load;
ret = _tdm_display_load_modules(private_display);
- if (ret != TDM_ERROR_NONE)
+ if (!(ret == TDM_ERROR_NONE || ret == TDM_ERROR_NO_MODULE))
goto failed_load;
stamp2 = tdm_helper_get_time();
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);
projects / platform / core / uifw / libtdm.git / blobdiff