Merge branch 'tizen' into sandbox/cyeon/devel

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

diff --git a/src/tdm.c b/src/tdm.c
index e6866cc..6375b53 100644 (file)
--- a/src/tdm.c
+++ b/src/tdm.c
@@ -262,6 +262,7 @@ tdm_display_destroy_private_output(tdm_private_output *private_output)
        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);
@@ -312,18 +313,19 @@ tdm_display_destroy_private_output(tdm_private_output *private_output)
                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)
@@ -333,6 +335,8 @@ tdm_display_destroy_private_output(tdm_private_output *private_output)
                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)
@@ -400,6 +404,8 @@ _tdm_display_update_caps_pp(tdm_private_module *private_module, tdm_caps_pp *cap
                return TDM_ERROR_BAD_MODULE;
        }
 
+       memset(caps, 0, sizeof(tdm_caps_pp));
+
        ret = func_display->display_get_pp_capability(private_module->bdata, caps);
        if (ret != TDM_ERROR_NONE) {
                TDM_ERR("backend(%s) display_get_pp_capability() failed", private_module->module_data->name);
@@ -460,6 +466,7 @@ _tdm_display_update_caps_output(tdm_private_module *private_module, int pipe,
        char temp[TDM_NAME_LEN];
        tdm_error ret;
        double stamp;
+       int n;
 
        stamp = tdm_helper_get_time();
        ret = func_output->output_get_capability(output_backend, caps);
@@ -472,7 +479,11 @@ _tdm_display_update_caps_output(tdm_private_module *private_module, int pipe,
        }
 
        /* FIXME: Use model for tdm client to distinguish amoung outputs */
-       snprintf(temp, TDM_NAME_LEN, "%s-%d", caps->model, pipe);
+       n = snprintf(temp, sizeof(temp), "%s-%d", caps->model, pipe);
+       if ((size_t)n >= sizeof(temp)) {
+                temp[sizeof(temp) - 1] = '\0';
+       }
+
        snprintf(caps->model, TDM_NAME_LEN, "%s", temp);
 
        return TDM_ERROR_NONE;
@@ -759,6 +770,8 @@ _tdm_display_setup(tdm_private_display *private_display)
        tdm_private_module *private_module = NULL;
        tdm_error ret = TDM_ERROR_NONE;
        int output_count = 0;
+       int virtual = 0;
+       int virtual_hwc_target_buffer_bo_default = 0;
 
        if (private_display->pp_module) {
                ret = _tdm_display_update_caps_pp(private_display->pp_module,
@@ -800,7 +813,7 @@ _tdm_display_setup(tdm_private_display *private_display)
                tdm_output **outputs;
                int i, count = 0;
 
-               TDM_INFO("loading a %s backend", TDM_DUMMY_MODULE);
+               TDM_INIT_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);
@@ -818,10 +831,17 @@ _tdm_display_setup(tdm_private_display *private_display)
                }
        }
 
-       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);
+       virtual = tdm_config_get_int(TDM_CONFIG_KEY_GENERAL_VIRTUAL_OUTPUT, 0);
+       if (virtual) {
+               TDM_INIT_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);
+
+               virtual_hwc_target_buffer_bo_default = tdm_config_get_int(TDM_CONFIG_KEY_GENERAL_VIRTUAL_OUTPUT_HWC_TARGET_BO_DEFAULT, 0);
+               if (virtual_hwc_target_buffer_bo_default)
+                       private_display->virtual_module->use_default_type_bo = 1;
+       }
 
        return TDM_ERROR_NONE;
 
@@ -996,7 +1016,7 @@ _tdm_display_load_module_with_file(tdm_private_display *private_display,
        if (!module) {
                TDM_ERR("%s", dlerror());
                TDM_TRACE_END();
-               ret = TDM_ERROR_BAD_MODULE;
+               ret = TDM_ERROR_NO_MODULE;
                goto failed_load;
        }
 
@@ -1027,7 +1047,9 @@ _tdm_display_load_module_with_file(tdm_private_display *private_display,
        /* We don't care if backend_data is NULL or not. It's up to backend. */
        TDM_TRACE_BEGIN("TDM_Init_Backend");
        stamp = tdm_helper_get_time();
+       TDM_INIT_INFO("init backend");
        bdata = module_data->init((tdm_display *)private_display, &ret);
+       TDM_INIT_INFO("init backend done");
        TDM_DBG("backend init() time: %.3f ms", (tdm_helper_get_time() - stamp) * 1000.0);
        TDM_TRACE_END();
 
@@ -1059,7 +1081,7 @@ _tdm_display_load_module_with_file(tdm_private_display *private_display,
 
        LIST_ADDTAIL(&private_module->link, &private_display->module_list);
 
-       TDM_INFO("Success to load '%s' module", module_data->name);
+       TDM_INIT_INFO("Success to load '%s' module", module_data->name);
 
        return TDM_ERROR_NONE;
 failed_load:
@@ -1089,12 +1111,12 @@ _tdm_display_load_modules(tdm_private_display *private_display)
 
        arg = strtok_r(temp, TDM_CONFIG_DELIM, &end);
        while (arg) {
-               TDM_INFO("loading a %s backend", arg);
+               TDM_INIT_INFO("loading a %s backend", arg);
                ret = _tdm_display_load_module_with_file(private_display, arg);
                if (ret == TDM_ERROR_NONE)
-                       TDM_INFO("%s backend loading success", arg);
+                       TDM_INIT_INFO("%s backend loading success", arg);
                else
-                       TDM_INFO("%s backend loading failed", arg);
+                       TDM_INIT_INFO("%s backend loading failed", arg);
                arg = strtok_r(NULL, TDM_CONFIG_DELIM, &end);
        }
 
@@ -1186,7 +1208,7 @@ tdm_display_init(tdm_error *error)
                goto failed_event;
 
        stamp2 = tdm_helper_get_time();
-       TDM_INFO("event loop init time: %.3f ms", (stamp2 - stamp1) * 1000.0);
+       TDM_INIT_INFO("event loop init time: %.3f ms", (stamp2 - stamp1) * 1000.0);
        stamp1 = stamp2;
 
        ret = tdm_vblank_init(private_display);
@@ -1210,11 +1232,11 @@ tdm_display_init(tdm_error *error)
                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();
-       TDM_INFO("loading backend time: %.3f ms", (stamp2 - stamp1) * 1000.0);
+       TDM_INIT_INFO("loading backend time: %.3f ms", (stamp2 - stamp1) * 1000.0);
        stamp1 = stamp2;
 
 #ifdef INIT_BUFMGR
@@ -1237,6 +1259,7 @@ tdm_display_init(tdm_error *error)
 
        TDM_TRACE_BEGIN("TDM_Update_Display");
        ret = _tdm_display_setup(private_display);
+       TDM_INIT_INFO("updating display");
        TDM_TRACE_END();
        if (ret != TDM_ERROR_NONE)
                goto failed_update;
@@ -1276,7 +1299,7 @@ tdm_display_init(tdm_error *error)
        _pthread_mutex_unlock(&private_display->lock);
        pthread_mutex_unlock(&gLock);
 
-       TDM_INFO("init time: %.3f ms", (tdm_helper_get_time() - start) * 1000.0);
+       TDM_INIT_INFO("init time: %.3f ms", (tdm_helper_get_time() - start) * 1000.0);
 
        return (tdm_display *)private_display;