private_output->regist_change_cb = 1;
}
- } else
- _tdm_display_destroy_caps_output(&private_output->caps);
+ ret = _tdm_display_update_caps_output(private_display, pipe, output_backend,
+ &private_output->caps);
+ if (ret != TDM_ERROR_NONE)
+ return ret;
+ } else {
+ tdm_caps_output new_caps;
- ret = _tdm_display_update_caps_output(private_display, pipe, output_backend,
- &private_output->caps);
- if (ret != TDM_ERROR_NONE)
- return ret;
+ ret = _tdm_display_update_caps_output(private_display, pipe, output_backend,
+ &new_caps);
+ if (ret != TDM_ERROR_NONE)
+ return ret;
+
+ /* FIXME: This is very ugly. need to fix after the TDM ABI is changed. */
+ if (private_output->caps.status != new_caps.status) {
+ _tdm_display_destroy_caps_output(&private_output->caps);
+ private_output->caps = new_caps;
+ private_output->current_mode = NULL;
+ } else {
+ tdm_output_mode *old_modes = private_output->caps.modes;
+ unsigned int old_mode_count = private_output->caps.mode_count;
+ if (new_caps.modes)
+ free(new_caps.modes);
+ new_caps.modes = old_modes;
+ new_caps.mode_count = old_mode_count;
+ if (private_output->caps.props)
+ free(private_output->caps.props);
+ private_output->caps = new_caps;
+ }
+ }
layers = func_output->output_get_layers(output_backend, &layer_count, &ret);
if (ret != TDM_ERROR_NONE)
break;
}
}
+
+ _tdm_display_destroy_caps_output(&caps);
}
/* ordering : main output is first */
/* below functions should be implemented in backend side */
TDM_RETURN_VAL_IF_FAIL(func_display != NULL, TDM_ERROR_BAD_MODULE);
- TDM_RETURN_VAL_IF_FAIL(func_display->display_get_capabilitiy, TDM_ERROR_BAD_MODULE);
+// TDM_RETURN_VAL_IF_FAIL(func_display->display_get_capabilitiy, TDM_ERROR_BAD_MODULE);
TDM_RETURN_VAL_IF_FAIL(func_display->display_get_outputs, TDM_ERROR_BAD_MODULE);
TDM_RETURN_VAL_IF_FAIL(func_output->output_get_capability, TDM_ERROR_BAD_MODULE);
TDM_RETURN_VAL_IF_FAIL(func_output->output_get_layers, TDM_ERROR_BAD_MODULE);
TDM_RETURN_VAL_IF_FAIL(func_layer->layer_get_capability, TDM_ERROR_BAD_MODULE);
- ret = func_display->display_get_capabilitiy(private_display->bdata, &private_display->caps_display);
+ if (func_display->display_get_capability)
+ ret = func_display->display_get_capability(private_display->bdata, &private_display->caps_display);
+ else
+ ret = func_display->display_get_capabilitiy(private_display->bdata, &private_display->caps_display);
if (ret != TDM_ERROR_NONE) {
- TDM_ERR("display_get_capabilitiy() failed");
+ TDM_ERR("display_get_capability() failed");
return TDM_ERROR_BAD_MODULE;
}
private_display->bdata = module_data->init((tdm_display *)private_display, &ret);
TDM_TRACE_END();
if (ret != TDM_ERROR_NONE) {
- TDM_ERR("'%s' init failed", file);
+ TDM_ERR("failed to init '%s' module", module_data->name);
goto failed_load;
}
goto failed_load;
}
- TDM_INFO("Success to load module(%s)", file);
+ TDM_INFO("Success to load '%s' module", module_data->name);
return TDM_ERROR_NONE;
failed_load:
return g_private_display;
}
+ private_display = calloc(1, sizeof(tdm_private_display));
+ if (!private_display) {
+ ret = TDM_ERROR_OUT_OF_MEMORY;
+ TDM_ERR("'private_display != NULL' failed");
+ goto failed_alloc;
+ }
+
debug = getenv("TDM_DEBUG_MODULE");
if (debug)
tdm_display_enable_debug_module(debug);
debug = getenv("TDM_DEBUG_DUMP");
if (debug)
- tdm_display_enable_dump(debug);
+ tdm_display_enable_dump(private_display, debug, NULL, NULL);
debug = getenv("TDM_DEBUG_PATH");
if (debug)
tdm_display_enable_path(debug);
- private_display = calloc(1, sizeof(tdm_private_display));
- if (!private_display) {
- ret = TDM_ERROR_OUT_OF_MEMORY;
- TDM_ERR("'private_display != NULL' failed");
- goto failed_alloc;
- }
-
if (pthread_mutex_init(&private_display->lock, NULL)) {
ret = TDM_ERROR_OPERATION_FAILED;
TDM_ERR("mutex init failed: %m");
free(private_display);
g_private_display = NULL;
+ if (tdm_debug_dump_dir) {
+ free(tdm_debug_dump_dir);
+ tdm_debug_dump_dir = NULL;
+ }
+
_pthread_mutex_unlock(&gLock);
TDM_INFO("done");
}
INTERN tdm_error
-tdm_display_enable_dump(const char *dump_str)
+tdm_display_enable_dump(tdm_private_display *private_display, const char *dump_str, char *reply, int *len)
{
- char temp[1024];
+ char temp[TDM_PATH_LEN] = {0,}, temp2[TDM_PATH_LEN] = {0,};
+ char *path, *path2;
char *arg;
char *end;
+ snprintf(temp2, TDM_PATH_LEN, "%s", dump_str);
+ path2 = strtostr(temp, TDM_PATH_LEN, temp2, "@");
+ if (!path2 || path2[0] == '\0')
+ path2 = TDM_DUMP_DIR;
+ else
+ path2++;
+
+ path = tdm_helper_dump_make_directory(path2, reply, len);
+ TDM_GOTO_IF_FAIL(path != NULL, done);
+
tdm_debug_dump = 0;
snprintf(temp, sizeof(temp), "%s", dump_str);
arg = strtok_r(temp, ",", &end);
- while (arg) {
- if (!strncmp(arg, "none", 4)) {
- tdm_debug_dump = 0;
- return TDM_ERROR_NONE;
+ TDM_GOTO_IF_FAIL(arg != NULL, done);
+
+ if (!strncmp(arg, "none", 4)) {
+ tdm_debug_dump = 0;
+ TDM_SNPRINTF(reply, len, "path: %s\n", (tdm_debug_dump_dir)?:"unknown");
+ if (tdm_debug_dump_dir) {
+ free(tdm_debug_dump_dir);
+ tdm_debug_dump_dir = NULL;
+ }
+ goto done;
+ }
+
+ if (!strncmp(arg, "current", 7)) {
+ tdm_private_output *o = NULL;
+ if (!private_display) {
+ TDM_WRN("no private_display");
+ goto done;
}
+
+ LIST_FOR_EACH_ENTRY(o, &private_display->output_list, link) {
+ tdm_private_layer *l = NULL;
+ LIST_FOR_EACH_ENTRY(l, &o->layer_list, link) {
+ char str[TDM_PATH_LEN];
+ if (l->usable || l->caps.capabilities & TDM_LAYER_CAPABILITY_VIDEO)
+ continue;
+ snprintf(str, TDM_PATH_LEN, "layer_%d_%d", o->index, l->index);
+ tdm_helper_dump_buffer_str(l->showing_buffer, path, str);
+ }
+ }
+
+ TDM_SNPRINTF(reply, len, "path: %s\n", path);
+ goto done;
+ }
+
+ TDM_SNPRINTF(reply, len, "dump: %s\n", arg);
+
+ while (arg) {
if (!strncmp(arg, "all", 3)) {
tdm_debug_dump = 0xFFFFFFFF;
- return TDM_ERROR_NONE;
- }
- if (!strncmp(arg, "layer", 5))
+ goto done;
+ } else if (!strncmp(arg, "layer", 5)) {
tdm_debug_dump |= TDM_DUMP_FLAG_LAYER;
- else if (!strncmp(arg, "pp", 2))
+ } else if (!strncmp(arg, "pp", 2)) {
tdm_debug_dump |= TDM_DUMP_FLAG_PP;
- else if (!strncmp(arg, "capture", 7))
+ } else if (!strncmp(arg, "capture", 7)) {
tdm_debug_dump |= TDM_DUMP_FLAG_CAPTURE;
- else
- return TDM_ERROR_BAD_REQUEST;
+ } else
+ goto done;
arg = strtok_r(NULL, ",", &end);
}
+ if (tdm_debug_dump_dir)
+ free(tdm_debug_dump_dir);
+
+ tdm_debug_dump_dir = strndup(path, TDM_PATH_LEN);
+
TDM_INFO("dump... '%s'", dump_str);
+done:
+ free(path);
return TDM_ERROR_NONE;
}
return TDM_ERROR_NONE;
}
+
+
+static void
+_tdm_display_ttrace_vblank_cb(tdm_vblank *vblank, tdm_error error, unsigned int sequence,
+ unsigned int tv_sec, unsigned int tv_usec, void *user_data)
+{
+ tdm_error ret = TDM_ERROR_NONE;
+
+ TDM_TRACE_MARK(VBlank);
+
+ ret = tdm_vblank_wait(vblank, 0, 0, 1, _tdm_display_ttrace_vblank_cb, NULL);
+ TDM_RETURN_IF_FAIL(ret == TDM_ERROR_NONE);
+}
+
+INTERN tdm_error
+tdm_display_enable_ttrace_vblank(tdm_display *dpy, tdm_output *output, int enable)
+{
+ static tdm_vblank *vblank = NULL;
+ tdm_error ret = TDM_ERROR_NONE;
+
+ if (!enable) {
+ if (vblank)
+ tdm_vblank_destroy(vblank);
+ vblank = NULL;
+ return TDM_ERROR_NONE;
+ } else {
+ const tdm_output_mode *mode = NULL;
+
+ if (vblank)
+ return TDM_ERROR_NONE;
+
+ vblank = tdm_vblank_create(dpy, output, &ret);
+ TDM_RETURN_VAL_IF_FAIL(vblank != NULL, ret);
+
+ ret = tdm_output_get_mode(output, &mode);
+ TDM_GOTO_IF_FAIL(mode != NULL, enable_fail);
+
+ ret = tdm_vblank_set_fps(vblank, mode->vrefresh);
+ TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, enable_fail);
+
+ ret = tdm_vblank_set_enable_fake(vblank, 1);
+ TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, enable_fail);
+
+ ret = tdm_vblank_wait(vblank, 0, 0, 1, _tdm_display_ttrace_vblank_cb, NULL);
+ TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, enable_fail);
+ }
+
+ return TDM_ERROR_NONE;
+
+enable_fail:
+ if (vblank)
+ tdm_vblank_destroy(vblank);
+ vblank = NULL;
+ return ret;
+}
+
projects / platform / core / uifw / libtdm.git / blobdiff