fix wrong log

[platform/core/uifw/libtdm.git] / src / tdm.c

diff --git a/src/tdm.c b/src/tdm.c
index 550b043..b04ab2d 100644 (file)
--- a/src/tdm.c
+++ b/src/tdm.c
@@ -1080,11 +1080,11 @@ tdm_display_enable_dump(tdm_private_display *private_display, const char *dump_s
 
        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;
                }
-               TDM_SNPRINTF(reply, len, "path: %s\n", path);
                goto done;
        }
 
@@ -1099,7 +1099,7 @@ tdm_display_enable_dump(tdm_private_display *private_display, const char *dump_s
                        tdm_private_layer *l = NULL;
                        LIST_FOR_EACH_ENTRY(l, &o->layer_list, link) {
                                char str[TDM_PATH_LEN];
-                               if (l->usable)
+                               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);
@@ -1180,7 +1180,7 @@ _tdm_display_ttrace_vblank_cb(tdm_vblank *vblank, tdm_error error, unsigned int
 {
        tdm_error ret = TDM_ERROR_NONE;
 
-       TDM_TRACE_COUNT(VBlank, sequence);
+       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);
@@ -1207,18 +1207,24 @@ tdm_display_enable_ttrace_vblank(tdm_display *dpy, tdm_output *output, int enabl
                TDM_RETURN_VAL_IF_FAIL(vblank != NULL, ret);
 
                ret = tdm_output_get_mode(output, &mode);
-               TDM_RETURN_VAL_IF_FAIL(mode != NULL, ret);
+               TDM_GOTO_IF_FAIL(mode != NULL, enable_fail);
 
                ret = tdm_vblank_set_fps(vblank, mode->vrefresh);
-               TDM_RETURN_VAL_IF_FAIL(ret == TDM_ERROR_NONE, ret);
+               TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, enable_fail);
 
                ret = tdm_vblank_set_enable_fake(vblank, 1);
-               TDM_RETURN_VAL_IF_FAIL(ret == TDM_ERROR_NONE, ret);
+               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_RETURN_VAL_IF_FAIL(ret == TDM_ERROR_NONE, ret);
+               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;
 }