correct the wrong list operation

Change-Id: If257e99a78646298593fb03c53002d67abf293bd

diff --git a/src/tdm_buffer.c b/src/tdm_buffer.c
index 3c48e0e3d107e176176b19d3c406b66ac9e6eed5..93bbd6141bd7d2d3efc2eb7fda0a164a66156eab 100644 (file)
--- a/src/tdm_buffer.c
+++ b/src/tdm_buffer.c
@@ -263,6 +263,9 @@ tdm_buffer_list_get_first_entry(struct list_head *list)
 
        TDM_RETURN_VAL_IF_FAIL(list != NULL, NULL);
 
+       if (LIST_IS_EMPTY(list))
+               return NULL;
+
        buf_info = container_of((list)->next, buf_info, link);
 
        return buf_info->buffer;

diff --git a/src/tdm_pp.c b/src/tdm_pp.c
index 9075c8b6f7a9fc9f348334f89963cc37048a23fe..17ea9df1e6ac8d3b107da606e5e1b458b1ba65d9 100644 (file)
--- a/src/tdm_pp.c
+++ b/src/tdm_pp.c
@@ -139,9 +139,13 @@ tdm_pp_cb_done(tdm_pp *pp_backend, tbm_surface_h src, tbm_surface_h dst,
        if (tdm_debug_buffer)
                TDM_INFO("pp(%p) done: src(%p) dst(%p)", private_pp, src, dst);
 
-       first_entry = container_of((&private_pp->buffer_list)->next, pp_buffer, link);
-       if (first_entry->src != src || first_entry->dst != dst)
-               TDM_ERR("buffer(%p,%p) is skipped", first_entry->src, first_entry->dst);
+       if (!LIST_IS_EMPTY(&private_pp->buffer_list)) {
+               first_entry = container_of((&private_pp->buffer_list)->next, pp_buffer, link);
+               if (first_entry->src != src || first_entry->dst != dst)
+                       TDM_ERR("buffer(%p,%p) is skipped", first_entry->src, first_entry->dst);
+       } else {
+               TDM_NEVER_GET_HERE();
+       }
 
        if ((pp_buffer = _tdm_pp_find_tbm_buffers(&private_pp->buffer_list, src, dst))) {
                LIST_DEL(&pp_buffer->link);

diff --git a/src/tdm_vblank.c b/src/tdm_vblank.c
index f5ec5f9f3a789ae081dd1e6dc37952c89bf5e2fd..4af896ff122479270261ce315bcfbc02e9cfbc20 100644 (file)
--- a/src/tdm_vblank.c
+++ b/src/tdm_vblank.c
@@ -180,25 +180,36 @@ static inline void
 _tdm_vblank_insert_wait(tdm_vblank_wait_info *wait_info, struct list_head *list)
 {
        tdm_vblank_wait_info *w = NULL;
+       tdm_vblank_wait_info *found = NULL;
 
-       LIST_FOR_EACH_ENTRY_REV(w, list, link) {
+       if (LIST_IS_EMPTY(list)) {
+               LIST_ADDTAIL(&wait_info->link, list);
+               return;
+       }
+
+       LIST_FOR_EACH_ENTRY(w, list, link) {
                /* If last_tv_sec == 0, we can't calculate target_sec. */
                if (wait_info->target_sec == 0) {
-                       if (w->interval > wait_info->interval)
+                       if (w->interval <= wait_info->interval) {
+                               found = w;
                                continue;
-                       list = &w->link;
-                       break;
+                       }
                } else {
-                       if (w->target_sec > wait_info->target_sec)
+                       if (w->target_sec < wait_info->target_sec) {
+                               found = w;
                                continue;
-                       if (w->target_usec > wait_info->target_usec)
+                       }
+                       if (w->target_sec == wait_info->target_sec && w->target_usec <= wait_info->target_usec) {
+                               found = w;
                                continue;
-                       list = &w->link;
+                       }
                }
-               break;
        }
 
-       LIST_ADDTAIL(&wait_info->link, list->next);
+       if (found)
+               LIST_ADD(&wait_info->link, &found->link);
+       else
+               LIST_ADDTAIL(&wait_info->link, list->next);
 }
 
 static void
@@ -502,6 +513,11 @@ _tdm_vblank_cb_vblank_SW(void *user_data)
 
        TDM_RETURN_VAL_IF_FAIL(private_vblank != NULL, TDM_ERROR_OPERATION_FAILED);
 
+       if (LIST_IS_EMPTY(&private_vblank->SW_wait_list)) {
+               VER("no wait_info");
+               return TDM_ERROR_OPERATION_FAILED;
+       }
+
        first_wait_info = container_of(private_vblank->SW_wait_list.next, first_wait_info, link);
        TDM_RETURN_VAL_IF_FAIL(first_wait_info != NULL, TDM_ERROR_OPERATION_FAILED);
 
@@ -547,6 +563,11 @@ _tdm_vblank_cb_vblank_SW_first(tdm_output *output, unsigned int sequence,
        private_vblank = wait_info->private_vblank;
        TDM_RETURN_IF_FAIL(private_vblank != NULL);
 
+       if (LIST_IS_EMPTY(&private_vblank->SW_pending_wait_list)) {
+               VER("no wait_info");
+               return;
+       }
+
        w = container_of((&private_vblank->SW_pending_wait_list)->next, w, link);
        TDM_RETURN_IF_FAIL(w != NULL);
 
@@ -586,6 +607,11 @@ _tdm_vblank_sw_timer_update(tdm_private_vblank *private_vblank)
        int ms_delay;
        tdm_error ret;
 
+       if (LIST_IS_EMPTY(&private_vblank->SW_wait_list)) {
+               VER("no wait_info");
+               return TDM_ERROR_OPERATION_FAILED;
+       }
+
        first_wait_info = container_of(private_vblank->SW_wait_list.next, first_wait_info, link);
        curr = tdm_helper_get_time_in_micros();
        target = first_wait_info->target_sec * 1000000 + first_wait_info->target_usec;
@@ -734,6 +760,7 @@ _tdm_vblank_wait_SW(tdm_vblank_wait_info *wait_info)
 
        ret = _tdm_vblank_sw_timer_update(private_vblank);
        if (ret != TDM_ERROR_NONE) {
+               LIST_DEL(&wait_info->link);
                VER("couldn't update sw timer");
                return ret;
        }
@@ -853,6 +880,7 @@ tdm_vblank_wait(tdm_vblank *vblank, unsigned int req_sec, unsigned int req_usec,
                return TDM_ERROR_OUT_OF_MEMORY;
        }
 
+       LIST_INITHEAD(&wait_info->link);
        LIST_ADDTAIL(&wait_info->valid_link, &valid_wait_list);
        wait_info->stamp = ++stamp;
        wait_info->req_sec = req_sec;
@@ -870,6 +898,7 @@ tdm_vblank_wait(tdm_vblank *vblank, unsigned int req_sec, unsigned int req_usec,
                ret = _tdm_vblank_wait_SW(wait_info);
 
        if (ret != TDM_ERROR_NONE) {
+               LIST_DEL(&wait_info->link);
                LIST_DEL(&wait_info->valid_link);
                free(wait_info);
                return ret;