X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Ftdm_pp.c;h=a53531afc5d548c88c9851c01b07d528268ea194;hb=67b749a49811a43bfec0cfbb1cdd4a631ae44c00;hp=c574d8af62869fd32da9175988fea123e7433bdd;hpb=5279a9ec05fb661f20959a02199712c60fb46bfa;p=platform%2Fcore%2Fuifw%2Flibtdm.git diff --git a/src/tdm_pp.c b/src/tdm_pp.c index c574d8a..a53531a 100644 --- a/src/tdm_pp.c +++ b/src/tdm_pp.c @@ -1,221 +1,294 @@ /************************************************************************** - -libtdm - -Copyright 2015 Samsung Electronics co., Ltd. All Rights Reserved. - -Contact: Eunchul Kim , - JinYoung Jeon , - Taeheon Kim , - YoungJun Cho , - SooChan Lim , - Boram Park - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sub license, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice (including the -next paragraph) shall be included in all copies or substantial portions -of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. -IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR -ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - + * + * libtdm + * + * Copyright 2015 Samsung Electronics co., Ltd. All Rights Reserved. + * + * Contact: Eunchul Kim , + * JinYoung Jeon , + * Taeheon Kim , + * YoungJun Cho , + * SooChan Lim , + * Boram Park + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sub license, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. + * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR + * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * **************************************************************************/ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include "tdm.h" -#include "tdm_backend.h" #include "tdm_private.h" #define PP_FUNC_ENTRY() \ - tdm_func_pp *func_pp; \ - tdm_private_display *private_display; \ - tdm_private_pp *private_pp; \ - tdm_error ret = TDM_ERROR_NONE; \ - TDM_RETURN_VAL_IF_FAIL(pp != NULL, TDM_ERROR_INVALID_PARAMETER); \ - private_pp = (tdm_private_pp*)pp; \ - private_display = private_pp->private_display; \ - func_pp = &private_display->func_pp - -static tdm_error -_tdm_pp_check_if_exist(tdm_private_pp *private_pp, - tbm_surface_h src, tbm_surface_h dst) + tdm_private_module *private_module; \ + tdm_func_pp *func_pp; \ + tdm_private_display *private_display; \ + tdm_private_pp *private_pp; \ + tdm_error ret = TDM_ERROR_NONE; \ + TDM_RETURN_VAL_IF_FAIL(pp != NULL, TDM_ERROR_INVALID_PARAMETER); \ + private_pp = (tdm_private_pp*)pp; \ + private_display = private_pp->private_display; \ + private_module = private_pp->private_module; \ + func_pp = &private_module->func_pp + +static void +_tdm_pp_print_list(struct list_head *list) { - tdm_buffer_info *buf_info = NULL; - - LIST_FOR_EACH_ENTRY(buf_info, &private_pp->src_buffer_list, link) { - if (buf_info->buffer == src) { - TDM_ERR("%p attached twice", src); - return TDM_ERROR_BAD_REQUEST; - } + tdm_pp_private_buffer *b = NULL; + char str[512], *p; + int len = sizeof(str); + + TDM_RETURN_IF_FAIL(list != NULL); + + str[0] = '\0'; + p = str; + LIST_FOR_EACH_ENTRY(b, list, link) { + if (len > 0) { + tbm_bo src_bo = tbm_surface_internal_get_bo(b->src, 0); + tbm_bo dst_bo = tbm_surface_internal_get_bo(b->dst, 0); + int src_flags = tbm_bo_get_flags(src_bo); + int dst_flags = tbm_bo_get_flags(dst_bo); + int l = snprintf(p, len, " (%p[bo_flags:%x], %p[bo_flags:%x])", + b->src, src_flags, b->dst, dst_flags); + p += l; + len -= l; + } else + break; } - LIST_FOR_EACH_ENTRY(buf_info, &private_pp->src_pending_buffer_list, link) { - if (buf_info->buffer == src) { - TDM_ERR("%p attached twice", src); - return TDM_ERROR_BAD_REQUEST; - } - } + TDM_INFO("\t %s", str); +} - LIST_FOR_EACH_ENTRY(buf_info, &private_pp->dst_buffer_list, link) { - if (buf_info->buffer == dst) { - TDM_ERR("%p attached twice", dst); - return TDM_ERROR_BAD_REQUEST; - } +static tdm_pp_private_buffer * +_tdm_pp_find_tbm_buffers(struct list_head *list, tbm_surface_h src, tbm_surface_h dst) +{ + tdm_pp_private_buffer *b = NULL, *bb = NULL; + + LIST_FOR_EACH_ENTRY_SAFE(b, bb, list, link) { + if (b->src == src && b->dst == dst) + return b; } - LIST_FOR_EACH_ENTRY(buf_info, &private_pp->dst_pending_buffer_list, link) { - if (buf_info->buffer == dst) { - TDM_ERR("%p attached twice", dst); - return TDM_ERROR_BAD_REQUEST; - } + return NULL; +} + +static tdm_pp_private_buffer * +_tdm_pp_find_buffer(struct list_head *list, tdm_pp_private_buffer *pp_buffer) +{ + tdm_pp_private_buffer *b = NULL, *bb = NULL; + + LIST_FOR_EACH_ENTRY_SAFE(b, bb, list, link) { + if (b == pp_buffer) + return b; } - return TDM_ERROR_NONE; + return NULL; } -INTERN void -tdm_pp_cb_done(tdm_pp *pp_backend, tbm_surface_h src, tbm_surface_h dst, - void *user_data) +static void +_tdm_pp_thread_cb_done(tdm_private_display *private_display, void *object, tdm_thread_cb_base *cb_base, void *user_data) { - tdm_private_pp *private_pp = user_data; - tdm_private_display *private_display = private_pp->private_display; - tdm_buffer_info *buf_info; - tbm_surface_h first_entry; + tdm_thread_cb_pp_done *pp_done = (tdm_thread_cb_pp_done *)cb_base; + tdm_private_pp *private_pp = object; + tdm_pp_private_buffer *pp_buffer = NULL, *first_entry = NULL; + tbm_surface_h src; + tbm_surface_h dst; TDM_RETURN_IF_FAIL(TDM_MUTEX_IS_LOCKED()); - if (private_pp->owner_tid != syscall(SYS_gettid)) { - tdm_thread_cb_pp_done pp_done; - tdm_error ret; - - pp_done.base.type = TDM_THREAD_CB_PP_DONE; - pp_done.base.length = sizeof pp_done; - pp_done.pp_stamp = private_pp->stamp; - pp_done.src = src; - pp_done.dst = dst; - pp_done.user_data = user_data; + assert(private_pp->owner_tid == syscall(SYS_gettid)); - ret = tdm_thread_send_cb(private_display->private_loop, &pp_done.base); - TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE); + src = pp_done->src; + dst = pp_done->dst; - return; + if (tdm_debug_dump & TDM_DUMP_FLAG_PP) { + /* LCOV_EXCL_START */ + char str[TDM_PATH_LEN]; + static int i; + snprintf(str, TDM_PATH_LEN, "pp_dst_%03d", i++); + tdm_helper_dump_buffer_str(dst, tdm_debug_dump_dir, str); + /* LCOV_EXCL_STOP */ } - if (private_pp->owner_tid != syscall(SYS_gettid)) + 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 (tdm_debug_buffer) - TDM_INFO("pp(%p) done: src(%p) dst(%p)", private_pp, src, dst); + if ((pp_buffer = _tdm_pp_find_tbm_buffers(&private_pp->buffer_list, src, dst))) { + LIST_DEL(&pp_buffer->link); + LIST_DELINIT(&pp_buffer->commit_link); - first_entry = tdm_buffer_list_get_first_entry(&private_pp->src_buffer_list); - if (first_entry != src) - TDM_ERR("src(%p) is skipped", first_entry); + if (tdm_debug_module & TDM_DEBUG_BUFFER) + TDM_INFO("pp(%p) done: src(%p) dst(%p)", private_pp, src, dst); - first_entry = tdm_buffer_list_get_first_entry(&private_pp->dst_buffer_list); - if (first_entry != dst) - TDM_ERR("dst(%p) is skipped", first_entry); + if (tdm_ttrace_module & TDM_TTRACE_PP) { + tbm_bo bo = tbm_surface_internal_get_bo(dst, 0); + TDM_TRACE_ASYNC_END((intptr_t)private_pp, "[PP] %d", tbm_bo_export(bo)); + } - if ((buf_info = tdm_buffer_get_info(src))) - LIST_DEL(&buf_info->link); + _pthread_mutex_unlock(&private_display->lock); + if (private_pp->done_func) + private_pp->done_func(private_pp, src, dst, private_pp->done_user_data); + tdm_buffer_unref_backend(src); + tdm_buffer_unref_backend(dst); + _pthread_mutex_lock(&private_display->lock); - if ((buf_info = tdm_buffer_get_info(dst))) - LIST_DEL(&buf_info->link); + free(pp_buffer); + } +} - _pthread_mutex_unlock(&private_display->lock); - tdm_buffer_unref_backend(src); - tdm_buffer_unref_backend(dst); - _pthread_mutex_lock(&private_display->lock); +static void +_tdm_pp_cb_done(tdm_pp *pp_module, tbm_surface_h src, tbm_surface_h dst, void *user_data) +{ + tdm_thread_cb_pp_done pp_done; + tdm_private_pp *private_pp = user_data; + tdm_error ret; + + TDM_RETURN_IF_FAIL(TDM_MUTEX_IS_LOCKED()); + + memset(&pp_done, 0, sizeof pp_done); + pp_done.base.type = TDM_THREAD_CB_PP_DONE; + pp_done.base.length = sizeof pp_done; + pp_done.base.object_stamp = private_pp->stamp; + pp_done.base.data = NULL; + pp_done.base.sync = 0; + pp_done.src = src; + pp_done.dst = dst; + + ret = tdm_thread_cb_call(private_pp, &pp_done.base, 1); + TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE); } -INTERN tdm_private_pp * -tdm_pp_find_stamp(tdm_private_display *private_display, unsigned long stamp) +static void * +_tdm_pp_find_object(tdm_private_display *private_display, double stamp) { + tdm_private_module *private_module = NULL; tdm_private_pp *private_pp = NULL; TDM_RETURN_VAL_IF_FAIL(TDM_MUTEX_IS_LOCKED(), NULL); - LIST_FOR_EACH_ENTRY(private_pp, &private_display->pp_list, link) { - if (private_pp->stamp == stamp) - return private_pp; + LIST_FOR_EACH_ENTRY(private_module, &private_display->module_list, link) { + LIST_FOR_EACH_ENTRY(private_pp, &private_module->pp_list, link) { + if (private_pp->stamp == stamp) + return private_pp; + } } return NULL; } +INTERN tdm_error +tdm_pp_init(tdm_private_display *private_display) +{ + tdm_thread_cb_set_find_func(TDM_THREAD_CB_PP_DONE, _tdm_pp_find_object); + + return TDM_ERROR_NONE; +} + INTERN tdm_private_pp * -tdm_pp_create_internal(tdm_private_display *private_display, tdm_error *error) +tdm_pp_create_internal(tdm_private_module *private_module, tdm_error *error) { + tdm_private_display *private_display; tdm_func_display *func_display; tdm_func_pp *func_pp; tdm_private_pp *private_pp = NULL; - tdm_pp *pp_backend = NULL; + tdm_pp *pp_module = NULL; tdm_error ret = TDM_ERROR_NONE; TDM_RETURN_VAL_IF_FAIL(TDM_MUTEX_IS_LOCKED(), NULL); + TDM_RETURN_VAL_IF_FAIL(private_module != NULL, NULL); - func_display = &private_display->func_display; - func_pp = &private_display->func_pp; + private_display = private_module->private_display; + func_display = &private_module->func_display; + func_pp = &private_module->func_pp; - if (!(private_display->capabilities & TDM_DISPLAY_CAPABILITY_PP)) { - TDM_ERR("no pp capability"); + if (!(private_module->capabilities & TDM_DISPLAY_CAPABILITY_PP)) { + /* LCOV_EXCL_START */ + TDM_ERR("backedn(%s) no pp capability", private_module->module_data->name); if (error) *error = TDM_ERROR_NO_CAPABILITY; return NULL; + /* LCOV_EXCL_STOP */ } - pp_backend = func_display->display_create_pp(private_display->bdata, &ret); + pp_module = func_display->display_create_pp(private_module->bdata, &ret); if (ret != TDM_ERROR_NONE) { + /* LCOV_EXCL_START */ if (error) *error = ret; return NULL; + /* LCOV_EXCL_STOP */ } private_pp = calloc(1, sizeof(tdm_private_pp)); if (!private_pp) { + /* LCOV_EXCL_START */ TDM_ERR("failed: alloc memory"); - func_pp->pp_destroy(pp_backend); + func_pp->pp_destroy(pp_module); if (error) *error = TDM_ERROR_OUT_OF_MEMORY; return NULL; + /* LCOV_EXCL_STOP */ + } + + ret = tdm_thread_cb_add(private_pp, TDM_THREAD_CB_PP_DONE, NULL, _tdm_pp_thread_cb_done, NULL); + if (ret != TDM_ERROR_NONE) { + TDM_ERR("pp tdm_thread_cb_add failed"); + func_pp->pp_destroy(pp_module); + free(private_pp); + if (error) + *error = ret; + return NULL; } - ret = func_pp->pp_set_done_handler(pp_backend, tdm_pp_cb_done, private_pp); + ret = func_pp->pp_set_done_handler(pp_module, _tdm_pp_cb_done, private_pp); if (ret != TDM_ERROR_NONE) { + /* LCOV_EXCL_START */ TDM_ERR("spp(%p) et pp_done_handler failed", private_pp); - func_pp->pp_destroy(pp_backend); + func_pp->pp_destroy(pp_module); + free(private_pp); if (error) *error = ret; return NULL; + /* LCOV_EXCL_STOP */ } - private_pp->stamp = tdm_helper_get_time_in_millis(); - while (tdm_pp_find_stamp(private_display, private_pp->stamp)) + private_pp->stamp = tdm_helper_get_time(); + while (_tdm_pp_find_object(private_display, private_pp->stamp)) private_pp->stamp++; - LIST_ADD(&private_pp->link, &private_display->pp_list); - private_pp->private_display = private_display; - private_pp->pp_backend = pp_backend; + LIST_ADD(&private_pp->link, &private_module->pp_list); + private_pp->private_display = private_module->private_display; + private_pp->private_module = private_module; + private_pp->pp_module = pp_module; private_pp->owner_tid = syscall(SYS_gettid); - LIST_INITHEAD(&private_pp->src_pending_buffer_list); - LIST_INITHEAD(&private_pp->dst_pending_buffer_list); - LIST_INITHEAD(&private_pp->src_buffer_list); - LIST_INITHEAD(&private_pp->dst_buffer_list); + LIST_INITHEAD(&private_pp->pending_buffer_list); + LIST_INITHEAD(&private_pp->buffer_list); if (error) *error = TDM_ERROR_NONE; @@ -227,67 +300,76 @@ INTERN void tdm_pp_destroy_internal(tdm_private_pp *private_pp) { tdm_private_display *private_display; + tdm_private_module *private_module; tdm_func_pp *func_pp; - tdm_buffer_info *b = NULL, *bb = NULL; + tdm_pp_private_buffer *b = NULL, *bb = NULL; + struct list_head clone_list; TDM_RETURN_IF_FAIL(TDM_MUTEX_IS_LOCKED()); if (!private_pp) return; + tdm_thread_cb_remove(private_pp, TDM_THREAD_CB_PP_DONE, NULL, _tdm_pp_thread_cb_done, NULL); + private_display = private_pp->private_display; - func_pp = &private_display->func_pp; + private_module = private_pp->private_module; + func_pp = &private_module->func_pp; LIST_DEL(&private_pp->link); - func_pp->pp_destroy(private_pp->pp_backend); + func_pp->pp_destroy(private_pp->pp_module); - if (!LIST_IS_EMPTY(&private_pp->src_pending_buffer_list)) { + if (!LIST_IS_EMPTY(&private_pp->pending_buffer_list)) { TDM_WRN("pp(%p) not finished:", private_pp); - tdm_buffer_list_dump(&private_pp->src_pending_buffer_list); + _tdm_pp_print_list(&private_pp->pending_buffer_list); - LIST_FOR_EACH_ENTRY_SAFE(b, bb, &private_pp->src_pending_buffer_list, link) { + LIST_INITHEAD(&clone_list); + LIST_FOR_EACH_ENTRY_SAFE(b, bb, &private_pp->pending_buffer_list, link) { LIST_DEL(&b->link); - _pthread_mutex_unlock(&private_display->lock); - tdm_buffer_unref_backend(b->buffer); - _pthread_mutex_lock(&private_display->lock); + LIST_ADDTAIL(&b->link, &clone_list); } - } - if (!LIST_IS_EMPTY(&private_pp->dst_pending_buffer_list)) { - TDM_WRN("pp(%p) not finished:", private_pp); - tdm_buffer_list_dump(&private_pp->dst_pending_buffer_list); - - LIST_FOR_EACH_ENTRY_SAFE(b, bb, &private_pp->dst_pending_buffer_list, link) { + _pthread_mutex_unlock(&private_display->lock); + LIST_FOR_EACH_ENTRY_SAFE(b, bb, &clone_list, link) { LIST_DEL(&b->link); - _pthread_mutex_unlock(&private_display->lock); - tdm_buffer_unref_backend(b->buffer); - _pthread_mutex_lock(&private_display->lock); + + if (tdm_ttrace_module & TDM_TTRACE_PP) { + tbm_bo bo = tbm_surface_internal_get_bo(b->dst, 0); + TDM_TRACE_ASYNC_END((intptr_t)private_pp, "[PP] %d", tbm_bo_export(bo)); + } + + tdm_buffer_unref_backend(b->src); + tdm_buffer_unref_backend(b->dst); + free(b); } + _pthread_mutex_lock(&private_display->lock); } - if (!LIST_IS_EMPTY(&private_pp->src_buffer_list)) { + if (!LIST_IS_EMPTY(&private_pp->buffer_list)) { TDM_WRN("pp(%p) not finished:", private_pp); - tdm_buffer_list_dump(&private_pp->src_buffer_list); + _tdm_pp_print_list(&private_pp->buffer_list); - LIST_FOR_EACH_ENTRY_SAFE(b, bb, &private_pp->src_buffer_list, link) { + LIST_INITHEAD(&clone_list); + LIST_FOR_EACH_ENTRY_SAFE(b, bb, &private_pp->buffer_list, link) { LIST_DEL(&b->link); - _pthread_mutex_unlock(&private_display->lock); - tdm_buffer_unref_backend(b->buffer); - _pthread_mutex_lock(&private_display->lock); + LIST_ADDTAIL(&b->link, &clone_list); } - } - - if (!LIST_IS_EMPTY(&private_pp->dst_buffer_list)) { - TDM_WRN("pp(%p) not finished:", private_pp); - tdm_buffer_list_dump(&private_pp->dst_buffer_list); - LIST_FOR_EACH_ENTRY_SAFE(b, bb, &private_pp->dst_buffer_list, link) { + _pthread_mutex_unlock(&private_display->lock); + LIST_FOR_EACH_ENTRY_SAFE(b, bb, &clone_list, link) { LIST_DEL(&b->link); - _pthread_mutex_unlock(&private_display->lock); - tdm_buffer_unref_backend(b->buffer); - _pthread_mutex_lock(&private_display->lock); + + if (tdm_ttrace_module & TDM_TTRACE_PP) { + tbm_bo bo = tbm_surface_internal_get_bo(b->dst, 0); + TDM_TRACE_ASYNC_END((intptr_t)private_pp, "[PP] %d", tbm_bo_export(bo)); + } + + tdm_buffer_unref_backend(b->src); + tdm_buffer_unref_backend(b->dst); + free(b); } + _pthread_mutex_lock(&private_display->lock); } private_pp->stamp = 0; @@ -320,25 +402,53 @@ tdm_pp_set_info(tdm_pp *pp, tdm_info_pp *info) _pthread_mutex_lock(&private_display->lock); if (!func_pp->pp_set_info) { + /* LCOV_EXCL_START */ _pthread_mutex_unlock(&private_display->lock); TDM_DBG("failed: not implemented!!"); return TDM_ERROR_NOT_IMPLEMENTED; + /* LCOV_EXCL_STOP */ } - TDM_INFO("pp(%p) info: src(%dx%d %d,%d %dx%d %c%c%c%c) dst(%dx%d %d,%d %dx%d %c%c%c%c) trans(%d) sync(%d) flags(%x)", - private_pp, info->src_config.size.h, info->src_config.size.v, - info->src_config.pos.x, info->src_config.pos.y, - info->src_config.pos.w, info->src_config.pos.h, - FOURCC_STR(info->src_config.format), - info->dst_config.size.h, info->dst_config.size.v, - info->dst_config.pos.x, info->dst_config.pos.y, - info->dst_config.pos.w, info->dst_config.pos.h, - FOURCC_STR(info->dst_config.format), - info->transform, info->sync, info->flags); - - ret = func_pp->pp_set_info(private_pp->pp_backend, info); + TDM_INFO("pp(%p) info: src(%ux%u %u,%u %ux%u %c%c%c%c) dst(%ux%u %u,%u %ux%u %c%c%c%c) trans(%d) sync(%d) flags(%x)", + private_pp, info->src_config.size.h, info->src_config.size.v, + info->src_config.pos.x, info->src_config.pos.y, + info->src_config.pos.w, info->src_config.pos.h, + FOURCC_STR(info->src_config.format), + info->dst_config.size.h, info->dst_config.size.v, + info->dst_config.pos.x, info->dst_config.pos.y, + info->dst_config.pos.w, info->dst_config.pos.h, + FOURCC_STR(info->dst_config.format), + info->transform, info->sync, info->flags); + + ret = func_pp->pp_set_info(private_pp->pp_module, info); TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE); + private_pp->info = *info; + + _pthread_mutex_unlock(&private_display->lock); + + return ret; +} + +EXTERN tdm_error +tdm_pp_set_done_handler(tdm_pp *pp, tdm_pp_done_handler func, void *user_data) +{ + tdm_private_display *private_display; + tdm_private_pp *private_pp; + tdm_error ret = TDM_ERROR_NONE; + + TDM_RETURN_VAL_IF_FAIL(pp != NULL, TDM_ERROR_INVALID_PARAMETER); + + private_pp = (tdm_private_pp*)pp; + private_display = private_pp->private_display; + + TDM_RETURN_VAL_IF_FAIL(func != NULL, TDM_ERROR_INVALID_PARAMETER); + + _pthread_mutex_lock(&private_display->lock); + + private_pp->done_func = func; + private_pp->done_user_data = user_data; + _pthread_mutex_unlock(&private_display->lock); return ret; @@ -347,6 +457,8 @@ tdm_pp_set_info(tdm_pp *pp, tdm_info_pp *info) EXTERN tdm_error tdm_pp_attach(tdm_pp *pp, tbm_surface_h src, tbm_surface_h dst) { + tdm_pp_private_buffer *pp_buffer; + PP_FUNC_ENTRY(); TDM_RETURN_VAL_IF_FAIL(src != NULL, TDM_ERROR_INVALID_PARAMETER); @@ -355,46 +467,69 @@ tdm_pp_attach(tdm_pp *pp, tbm_surface_h src, tbm_surface_h dst) _pthread_mutex_lock(&private_display->lock); if (!func_pp->pp_attach) { + /* LCOV_EXCL_START */ _pthread_mutex_unlock(&private_display->lock); TDM_DBG("failed: not implemented!!"); return TDM_ERROR_NOT_IMPLEMENTED; + /* LCOV_EXCL_STOP */ } - if (tdm_display_check_module_abi(private_display, 1, 2) && - private_display->caps_pp.max_attach_count > 0) { - int length = LIST_LENGTH(&private_pp->src_pending_buffer_list) + - LIST_LENGTH(&private_pp->src_buffer_list); - if (length >= private_display->caps_pp.max_attach_count) { + if (tdm_module_check_abi(private_module, 1, 2) && + private_module->caps_pp.max_attach_count > 0) { + /* LCOV_EXCL_START */ + int length = LIST_LENGTH(&private_pp->pending_buffer_list) + + LIST_LENGTH(&private_pp->buffer_list); + if (length >= private_module->caps_pp.max_attach_count) { _pthread_mutex_unlock(&private_display->lock); - TDM_DBG("failed: too many attached!! max_attach_count(%d)", - private_display->caps_pp.max_attach_count); + TDM_DBG("failed: backend(%s) too many attached!! max_attach_count(%d)", + private_module->module_data->name, private_module->caps_pp.max_attach_count); return TDM_ERROR_BAD_REQUEST; } + /* LCOV_EXCL_STOP */ } - ret = _tdm_pp_check_if_exist(private_pp, src, dst); - if (ret != TDM_ERROR_NONE) { + if (tdm_debug_dump & TDM_DUMP_FLAG_PP) { + /* LCOV_EXCL_START */ + char str[TDM_PATH_LEN]; + static int i; + snprintf(str, TDM_PATH_LEN, "pp_src_%03d", i++); + tdm_helper_dump_buffer_str(src, tdm_debug_dump_dir, str); + /* LCOV_EXCL_STOP */ + } + + pp_buffer = calloc(1, sizeof * pp_buffer); + if (!pp_buffer) { + /* LCOV_EXCL_START */ _pthread_mutex_unlock(&private_display->lock); - return ret; + TDM_ERR("alloc failed"); + return TDM_ERROR_OUT_OF_MEMORY; + /* LCOV_EXCL_STOP */ } - ret = func_pp->pp_attach(private_pp->pp_backend, src, dst); + ret = func_pp->pp_attach(private_pp->pp_module, src, dst); TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE); - if (ret == TDM_ERROR_NONE) { - tdm_buffer_info *buf_info; + if (ret != TDM_ERROR_NONE) { + /* LCOV_EXCL_START */ + free(pp_buffer); + _pthread_mutex_unlock(&private_display->lock); + TDM_ERR("attach failed"); + return ret; + /* LCOV_EXCL_STOP */ + } - if ((buf_info = tdm_buffer_get_info(src))) - LIST_ADDTAIL(&buf_info->link, &private_pp->src_pending_buffer_list); + LIST_ADDTAIL(&pp_buffer->link, &private_pp->pending_buffer_list); + pp_buffer->src = tdm_buffer_ref_backend(src); + pp_buffer->dst = tdm_buffer_ref_backend(dst); - if ((buf_info = tdm_buffer_get_info(dst))) - LIST_ADDTAIL(&buf_info->link, &private_pp->dst_pending_buffer_list); + if (tdm_debug_module & TDM_DEBUG_BUFFER) { + TDM_INFO("pp(%p) attached:", private_pp); + _tdm_pp_print_list(&private_pp->pending_buffer_list); + } - if (tdm_debug_buffer) { - TDM_INFO("pp(%p) attached:", private_pp); - tdm_buffer_list_dump(&private_pp->src_pending_buffer_list); - tdm_buffer_list_dump(&private_pp->dst_pending_buffer_list); - } + if (tdm_ttrace_module & TDM_TTRACE_PP) { + tbm_bo bo = tbm_surface_internal_get_bo(dst, 0); + TDM_TRACE_ASYNC_BEGIN((intptr_t)pp, "[PP] %d", tbm_bo_export(bo)); } _pthread_mutex_unlock(&private_display->lock); @@ -405,38 +540,47 @@ tdm_pp_attach(tdm_pp *pp, tbm_surface_h src, tbm_surface_h dst) EXTERN tdm_error tdm_pp_commit(tdm_pp *pp) { - tdm_buffer_info *b = NULL, *bb = NULL; + tdm_pp_private_buffer *b = NULL, *bb = NULL; + struct list_head commit_buffer_list; PP_FUNC_ENTRY(); _pthread_mutex_lock(&private_display->lock); if (!func_pp->pp_commit) { + /* LCOV_EXCL_START */ _pthread_mutex_unlock(&private_display->lock); TDM_DBG("failed: not implemented!!"); return TDM_ERROR_NOT_IMPLEMENTED; + /* LCOV_EXCL_STOP */ } - ret = func_pp->pp_commit(private_pp->pp_backend); + LIST_INITHEAD(&commit_buffer_list); + + LIST_FOR_EACH_ENTRY_SAFE(b, bb, &private_pp->pending_buffer_list, link) { + LIST_DEL(&b->link); + LIST_ADDTAIL(&b->link, &private_pp->buffer_list); + LIST_ADDTAIL(&b->commit_link, &commit_buffer_list); + } + + ret = func_pp->pp_commit(private_pp->pp_module); TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE); - if (ret == TDM_ERROR_NONE) { - LIST_FOR_EACH_ENTRY_SAFE(b, bb, &private_pp->src_pending_buffer_list, link) { - LIST_DEL(&b->link); - tdm_buffer_ref_backend(b->buffer); - LIST_ADDTAIL(&b->link, &private_pp->src_buffer_list); - } + LIST_FOR_EACH_ENTRY_SAFE(b, bb, &commit_buffer_list, commit_link) { + LIST_DELINIT(&b->commit_link); - LIST_FOR_EACH_ENTRY_SAFE(b, bb, &private_pp->dst_pending_buffer_list, link) { + if (!_tdm_pp_find_buffer(&private_pp->buffer_list, b)) + continue; + + if (ret != TDM_ERROR_NONE) { + _pthread_mutex_unlock(&private_display->lock); + tdm_buffer_unref_backend(b->src); + tdm_buffer_unref_backend(b->dst); + _pthread_mutex_lock(&private_display->lock); LIST_DEL(&b->link); - tdm_buffer_ref_backend(b->buffer); - LIST_ADDTAIL(&b->link, &private_pp->dst_buffer_list); + + free(b); } - } else { - LIST_FOR_EACH_ENTRY_SAFE(b, bb, &private_pp->src_pending_buffer_list, link) - LIST_DEL(&b->link); - LIST_FOR_EACH_ENTRY_SAFE(b, bb, &private_pp->dst_pending_buffer_list, link) - LIST_DEL(&b->link); } _pthread_mutex_unlock(&private_display->lock);