fix the resource leak

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

diff --git a/src/tdm_vblank.c b/src/tdm_vblank.c
index 263f825..fe72c64 100644 (file)
--- a/src/tdm_vblank.c
+++ b/src/tdm_vblank.c
@@ -9,7 +9,7 @@
  *          Taeheon Kim <th908.kim@samsung.com>,
  *          YoungJun Cho <yj44.cho@samsung.com>,
  *          SooChan Lim <sc1.lim@samsung.com>,
- *          Boram Park <sc1.lim@samsung.com>
+ *          Boram Park <boram1288.park@samsung.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
@@ -321,7 +321,7 @@ _tdm_vblank_insert_wait(tdm_vblank_wait_info *wait_info, struct list_head *list)
        if (found)
                LIST_ADD(&wait_info->link, &found->link);
        else
-               LIST_ADDTAIL(&wait_info->link, list->next);
+               LIST_ADDTAIL(&wait_info->link, list);
 }
 
 static void
@@ -450,6 +450,45 @@ _tdm_vblank_cb_output_change(tdm_output *output, tdm_output_change_type type,
 }
 /* LCOV_EXCL_STOP */
 
+static tdm_error
+_tdm_vblank_set_fps(tdm_vblank *vblank, unsigned int fps)
+{
+       tdm_private_vblank *private_vblank = vblank;
+
+       if (private_vblank->fps_fixed) {
+               VIN("fps(%u) can't be changed", private_vblank->fps);
+               return TDM_ERROR_NONE;
+       }
+
+       private_vblank->fps_changeable = 0;
+
+       if (private_vblank->fps == fps)
+               return TDM_ERROR_NONE;
+
+       private_vblank->fps = fps;
+       private_vblank->check_HW_or_SW = 1;
+
+       VIN("fps(%u) changed", fps);
+
+       return TDM_ERROR_NONE;
+}
+
+static tdm_error
+_tdm_vblank_ignore_global_fps(tdm_vblank *vblank, unsigned int ignore)
+{
+       tdm_private_vblank *private_vblank = vblank;
+
+       if (private_vblank->ignore_global_fps == ignore)
+               return TDM_ERROR_NONE;
+
+       private_vblank->ignore_global_fps = ignore;
+       private_vblank->check_HW_or_SW = 1;
+
+       VIN("ignore_global_fps(%u)", private_vblank->ignore_global_fps);
+
+       return TDM_ERROR_NONE;
+}
+
 EXTERN tdm_error
 tdm_vblank_set_client_vblank_fps(unsigned int pid, const char *name, unsigned int fps)
 {
@@ -483,7 +522,7 @@ tdm_vblank_set_client_vblank_fps(unsigned int pid, const char *name, unsigned in
                                continue;
                }
 
-               ret = tdm_vblank_set_fps(v, fps);
+               ret = _tdm_vblank_set_fps(v, fps);
                if (ret == TDM_ERROR_NONE)
                        TDM_INFO("(pid:%u) '%s' fps changed: %d", pid, v->name, fps);
                else
@@ -526,7 +565,7 @@ tdm_vblank_set_client_ignore_global_fps(unsigned int pid, const char *name, unsi
                                continue;
                }
 
-               ret = tdm_vblank_ignore_global_fps(v, ignore);
+               ret = _tdm_vblank_ignore_global_fps(v, ignore);
                if (ret == TDM_ERROR_NONE)
                        TDM_INFO("(pid:%u) '%s' ignore changed: %u", pid, v->name, ignore);
                else
@@ -558,6 +597,12 @@ tdm_vblank_enable_global_fps(unsigned int enable, unsigned int fps)
 
                v->check_HW_or_SW = 1;
        }
+
+       if (enable)
+               tdm_hwc_set_vblank(fps);
+       else
+               tdm_hwc_unset_vblank();
+
        pthread_mutex_unlock(&valid_list_lock);
 
        return TDM_ERROR_NONE;
@@ -601,7 +646,7 @@ _tdm_vblank_call_thread_cb(tdm_private_vblank *private_vblank)
        vblank_create.base.sync = 0;
        vblank_create.vblank_stamp = private_vblank->stamp;
 
-       ret = tdm_thread_cb_call(private_vblank->dpy, &vblank_create.base);
+       ret = tdm_thread_cb_call(private_vblank->dpy, &vblank_create.base, 1);
        TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
 
        return TDM_ERROR_NONE;
@@ -732,8 +777,8 @@ tdm_vblank_create(tdm_display *dpy, tdm_output *output, tdm_error *error)
        tdm_private_vblank *private_vblank;
        tdm_error ret;
 
-       TDM_RETURN_VAL_IF_FAIL_WITH_ERROR(tdm_display_is_valid(dpy), TDM_ERROR_INVALID_PARAMETER, NULL);
-       TDM_RETURN_VAL_IF_FAIL_WITH_ERROR(tdm_output_is_valid(output), TDM_ERROR_INVALID_PARAMETER, NULL);
+       TDM_RETURN_VAL_IF_FAIL_WITH_ERROR(dpy != NULL, TDM_ERROR_INVALID_PARAMETER, NULL);
+       TDM_RETURN_VAL_IF_FAIL_WITH_ERROR(output != NULL, TDM_ERROR_INVALID_PARAMETER, NULL);
 
        if (error)
                *error = TDM_ERROR_NONE;
@@ -909,27 +954,10 @@ tdm_vblank_get_name(tdm_vblank *vblank, const char **name)
 EXTERN tdm_error
 tdm_vblank_set_fps(tdm_vblank *vblank, unsigned int fps)
 {
-       tdm_private_vblank *private_vblank = vblank;
-
        TDM_RETURN_VAL_IF_FAIL(tdm_vblank_is_valid(vblank), TDM_ERROR_INVALID_PARAMETER);
        TDM_RETURN_VAL_IF_FAIL(fps > 0, TDM_ERROR_INVALID_PARAMETER);
 
-       if (private_vblank->fps_fixed) {
-               VIN("fps(%u) can't be changed", private_vblank->fps);
-               return TDM_ERROR_NONE;
-       }
-
-       private_vblank->fps_changeable = 0;
-
-       if (private_vblank->fps == fps)
-               return TDM_ERROR_NONE;
-
-       private_vblank->fps = fps;
-       private_vblank->check_HW_or_SW = 1;
-
-       VIN("fps(%u) changed", fps);
-
-       return TDM_ERROR_NONE;
+       return _tdm_vblank_set_fps(vblank, fps);
 }
 
 EXTERN tdm_error
@@ -970,19 +998,9 @@ tdm_vblank_set_fixed_fps(tdm_vblank *vblank, unsigned int fps)
 EXTERN tdm_error
 tdm_vblank_ignore_global_fps(tdm_vblank *vblank, unsigned int ignore)
 {
-       tdm_private_vblank *private_vblank = vblank;
-
        TDM_RETURN_VAL_IF_FAIL(tdm_vblank_is_valid(vblank), TDM_ERROR_INVALID_PARAMETER);
 
-       if (private_vblank->ignore_global_fps == ignore)
-               return TDM_ERROR_NONE;
-
-       private_vblank->ignore_global_fps = ignore;
-       private_vblank->check_HW_or_SW = 1;
-
-       VIN("ignore_global_fps(%u)", private_vblank->ignore_global_fps);
-
-       return TDM_ERROR_NONE;
+       return _tdm_vblank_ignore_global_fps(vblank, ignore);
 }
 
 EXTERN tdm_error
@@ -1410,7 +1428,7 @@ _tdm_vblank_cb_timeout_SW(void *user_data)
        vblank_sw.base.data = NULL;
        vblank_sw.base.sync = 0;
 
-       ret = tdm_thread_cb_call(private_vblank, &vblank_sw.base);
+       ret = tdm_thread_cb_call(private_vblank, &vblank_sw.base, 1);
        TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
 
        return TDM_ERROR_NONE;
@@ -1563,8 +1581,8 @@ tdm_vblank_wait(tdm_vblank *vblank, unsigned int req_sec, unsigned int req_usec,
 
        /* 1) if fps != factor of vrefresh, SW timer
         * 2) if fps == factor of vrefresh && dpms == off, SW timer (Fake HW vblank)
-        * 2) if fps == factor of vrefresh && dpms == on && offset == 0, HW vblank
-        * 3) if fps == factor of vrefresh && dpms == on && offset != 0, HW vblank + SW timer
+        * 3) if fps == factor of vrefresh && dpms == on && offset == 0, HW vblank
+        * 4) if fps == factor of vrefresh && dpms == on && offset != 0, HW vblank + SW timer
         * In case of 1), we really don't need to align with HW vblank.
         */
        if (private_vblank->vrefresh % fps)