X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Ftbm_bo.c;h=39aac766ce8a337a473a4ceb8caa0441829189a7;hb=e565c41f907df4ed8a2b85d304bf11cc3ba0724d;hp=69d318db38985e20e5c0c45a2b86868cb3922d49;hpb=1f2d26c77c8c6fe4ce85b90ff767143175d60dba;p=platform%2Fcore%2Fuifw%2Flibtbm.git diff --git a/src/tbm_bo.c b/src/tbm_bo.c index 69d318d..39aac76 100644 --- a/src/tbm_bo.c +++ b/src/tbm_bo.c @@ -34,15 +34,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "tbm_bufmgr_int.h" #include "list.h" -static pthread_mutex_t tbm_bo_lock = PTHREAD_MUTEX_INITIALIZER; -static __thread tbm_error_e tbm_last_error = TBM_ERROR_NONE; -static void _tbm_bo_mutex_unlock(void); - /* check condition */ #define TBM_BO_RETURN_IF_FAIL(cond) {\ if (!(cond)) {\ TBM_ERR("'%s' failed.\n", #cond);\ - _tbm_bo_mutex_unlock();\ + _tbm_set_last_result(TBM_ERROR_INVALID_PARAMETER);\ + _tbm_bufmgr_mutex_unlock();\ return;\ } \ } @@ -50,54 +47,13 @@ static void _tbm_bo_mutex_unlock(void); #define TBM_BO_RETURN_VAL_IF_FAIL(cond, val) {\ if (!(cond)) {\ TBM_ERR("'%s' failed.\n", #cond);\ - _tbm_bo_mutex_unlock();\ + _tbm_set_last_result(TBM_ERROR_INVALID_PARAMETER);\ + _tbm_bufmgr_mutex_unlock();\ return val;\ } \ } -static void -_tbm_set_last_result(tbm_error_e err) -{ - tbm_last_error = err; -} - -/* LCOV_EXCL_START */ -static bool -_tbm_bo_mutex_init(void) -{ - static bool tbm_bo_mutex_init = false; - - if (tbm_bo_mutex_init) - return true; - - if (pthread_mutex_init(&tbm_bo_lock, NULL)) { - TBM_ERR("fail: Cannot pthread_mutex_init for tbm_bo_lock.\n"); - return false; - } - - tbm_bo_mutex_init = true; - - return true; -} - -static void -_tbm_bo_mutex_lock(void) -{ - if (!_tbm_bo_mutex_init()) { - TBM_ERR("fail: _tbm_bo_mutex_init()\n"); - return; - } - - pthread_mutex_lock(&tbm_bo_lock); -} - -static void -_tbm_bo_mutex_unlock(void) -{ - pthread_mutex_unlock(&tbm_bo_lock); -} - -static char * +char * _tbm_flag_to_str(int f) { static char str[255]; @@ -130,22 +86,10 @@ _tbm_flag_to_str(int f) return str; } -static void -_tbm_util_check_bo_cnt(tbm_bufmgr bufmgr) -{ - static int last_chk_bo_cnt = 0; - - if ((bufmgr->bo_cnt >= 500) && ((bufmgr->bo_cnt % 20) == 0) && - (bufmgr->bo_cnt > last_chk_bo_cnt)) { - TBM_DBG("============TBM BO CNT DEBUG: bo_cnt=%d\n", bufmgr->bo_cnt); - tbm_bufmgr_debug_show(bufmgr); - last_chk_bo_cnt = bufmgr->bo_cnt; - } -} /* LCOV_EXCL_STOP */ -tbm_user_data -*user_data_lookup(struct list_head *user_data_list, unsigned long key) +tbm_user_data * +user_data_lookup(struct list_head *user_data_list, unsigned long key) { tbm_user_data *old_data = NULL; @@ -160,8 +104,8 @@ tbm_user_data return NULL; } -tbm_user_data -*user_data_create(unsigned long key, tbm_data_free data_free_func) +tbm_user_data * +user_data_create(unsigned long key, tbm_data_free data_free_func) { tbm_user_data *user_data; @@ -169,6 +113,7 @@ tbm_user_data if (!user_data) { /* LCOV_EXCL_START */ TBM_ERR("fail to allocate an user_date\n"); + _tbm_set_last_result(TBM_ERROR_OUT_OF_MEMORY); return NULL; /* LCOV_EXCL_STOP */ } @@ -196,17 +141,32 @@ _bo_lock(tbm_bo bo, int device, int opt) int ret = 1; tbm_error_e error; - if (bo->bufmgr->backend_module_data) { + if (bo->bufmgr->use_hal_tbm) { + error = (tbm_error_e)hal_tbm_bo_lock((hal_tbm_bo *)bo->bo_data, device, opt); + if (error == TBM_ERROR_NOT_SUPPORTED) { + _tbm_set_last_result(TBM_ERROR_NONE); + } else { + if (error != TBM_ERROR_NONE) { + TBM_WRN("fail to lock"); + _tbm_set_last_result(error); + ret = 0; + } + } + } else if (bo->bufmgr->backend_module_data) { if (bo->bufmgr->bo_func->bo_lock) { error = bo->bufmgr->bo_func->bo_lock(bo->bo_data, device, opt); if (error != TBM_ERROR_NONE) { TBM_WRN("fail to lock"); + _tbm_set_last_result(error); ret = 0; } } } else { - if (bo->bufmgr->backend->bo_lock) + if (bo->bufmgr->backend->bo_lock) { ret = bo->bufmgr->backend->bo_lock(bo, device, opt); + if (!ret) + _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION); + } } return ret; @@ -217,11 +177,23 @@ _bo_unlock(tbm_bo bo) { tbm_error_e error; - if (bo->bufmgr->backend_module_data) { + if (bo->bufmgr->use_hal_tbm) { + error = (tbm_error_e)hal_tbm_bo_unlock((hal_tbm_bo *)bo->bo_data); + if (error == TBM_ERROR_NOT_SUPPORTED) { + _tbm_set_last_result(TBM_ERROR_NONE); + } else { + if (error != TBM_ERROR_NONE) { + TBM_WRN("fail to lock"); + _tbm_set_last_result(error); + } + } + } else if (bo->bufmgr->backend_module_data) { if (bo->bufmgr->bo_func->bo_unlock) { error = bo->bufmgr->bo_func->bo_unlock(bo->bo_data); - if (error != TBM_ERROR_NONE) + if (error != TBM_ERROR_NONE) { TBM_WRN("fail to unlock"); + _tbm_set_last_result(error); + } } } else { if (bo->bufmgr->backend->bo_unlock) @@ -252,18 +224,18 @@ _tbm_bo_lock(tbm_bo bo, int device, int opt) switch (bo->bufmgr->bo_lock_type) { case TBM_BUFMGR_BO_LOCK_TYPE_ONCE: if (bo->lock_cnt == 0) { - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); ret = _bo_lock(bo, device, opt); - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); if (ret) bo->lock_cnt++; } else ret = 1; break; case TBM_BUFMGR_BO_LOCK_TYPE_ALWAYS: - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); ret = _bo_lock(bo, device, opt); - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); if (ret) bo->lock_cnt++; break; @@ -317,105 +289,65 @@ _tbm_bo_unlock(tbm_bo bo) } static int -_tbm_bo_is_valid(tbm_bo bo) +_tbm_bo_magic_check(tbm_bo bo) { - tbm_bufmgr bufmgr = NULL; - tbm_bo old_data = NULL; - - if (bo == NULL) { - TBM_ERR("error: bo is NULL.\n"); + if (bo->magic != TBM_BO_MAGIC) return 0; - } - bufmgr = tbm_bufmgr_get(); - if (bufmgr == NULL) { - TBM_ERR("error: bufmgr is NULL.\n"); + return 1; +} + +static int +_tbm_bo_is_valid(tbm_bo bo) +{ + if (!bo) { + TBM_ERR("error: bo is NULL.\n"); return 0; } - if (LIST_IS_EMPTY(&bufmgr->bo_list)) { - TBM_ERR("error: bo->bo->bufmgr->bo_list is EMPTY.\n"); + if (!_tbm_bo_magic_check(bo)) { + TBM_ERR("error: No valid bo(%p).\n", bo); return 0; } - LIST_FOR_EACH_ENTRY(old_data, &bufmgr->bo_list, item_link) { - if (old_data == bo) - return 1; - } + return 1; +} - TBM_ERR("error: No valid bo(%p).\n", bo); +static void +_tbm_bo_deinit(tbm_bo bo) +{ + bo->magic = 0; - return 0; + bo->bufmgr->bo_cnt--; + LIST_DEL(&bo->item_link); } tbm_bo tbm_bo_alloc(tbm_bufmgr bufmgr, int size, int flags) { tbm_bo bo; - void *bo_priv; - tbm_backend_bo_data *bo_data; tbm_error_e error; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); + _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(bufmgr), NULL); TBM_BO_RETURN_VAL_IF_FAIL(size > 0, NULL); - bo = calloc(1, sizeof(struct _tbm_bo)); + bo = tbm_bufmgr_internal_alloc_bo(bufmgr, size, flags, &error); if (!bo) { /* LCOV_EXCL_START */ - TBM_ERR("error: fail to create of tbm_bo size(%d) flag(%s)\n", - size, _tbm_flag_to_str(flags)); - _tbm_set_last_result(TBM_BO_ERROR_HEAP_ALLOC_FAILED); - _tbm_bo_mutex_unlock(); + TBM_ERR("tbm_bufmgr_internal_alloc_bo failed. error:%d", error); + _tbm_set_last_result(error); + _tbm_bufmgr_mutex_unlock(); return NULL; /* LCOV_EXCL_STOP */ } - _tbm_util_check_bo_cnt(bufmgr); - - bo->bufmgr = bufmgr; - - if (bufmgr->backend_module_data) { - bo_data = bufmgr->bufmgr_func->bufmgr_alloc_bo(bufmgr->bufmgr_data, (unsigned int)size, flags, &error); - if (!bo_data) { - /* LCOV_EXCL_START */ - TBM_ERR("error: fail to create of tbm_bo size(%d) flag(%s)\n", - size, _tbm_flag_to_str(flags)); - _tbm_set_last_result(TBM_BO_ERROR_BO_ALLOC_FAILED); - free(bo); - _tbm_bo_mutex_unlock(); - return NULL; - /* LCOV_EXCL_STOP */ - } - bo->bo_data = bo_data; - } else { - bo_priv = bo->bufmgr->backend->bo_alloc(bo, size, flags); - if (!bo_priv) { - /* LCOV_EXCL_START */ - TBM_ERR("error: fail to create of tbm_bo size(%d) flag(%s)\n", - size, _tbm_flag_to_str(flags)); - _tbm_set_last_result(TBM_BO_ERROR_BO_ALLOC_FAILED); - free(bo); - _tbm_bo_mutex_unlock(); - return NULL; - /* LCOV_EXCL_STOP */ - } - bo->priv = bo_priv; - } - - bo->bufmgr->bo_cnt++; - bo->ref_cnt = 1; - bo->flags = flags; - TBM_TRACE_BO("bo(%p) size(%d) refcnt(%d), flag(%s)\n", bo, size, bo->ref_cnt, _tbm_flag_to_str(bo->flags)); - LIST_INITHEAD(&bo->user_data_list); - - LIST_ADD(&bo->item_link, &bo->bufmgr->bo_list); - - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return bo; } @@ -423,7 +355,8 @@ tbm_bo_alloc(tbm_bufmgr bufmgr, int size, int flags) tbm_bo tbm_bo_ref(tbm_bo bo) { - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); + _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), NULL); @@ -431,7 +364,7 @@ tbm_bo_ref(tbm_bo bo) TBM_TRACE_BO("bo(%p) ref_cnt(%d)\n", bo, bo->ref_cnt); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return bo; } @@ -439,14 +372,15 @@ tbm_bo_ref(tbm_bo bo) void tbm_bo_unref(tbm_bo bo) { - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); + _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_IF_FAIL(_tbm_bo_is_valid(bo)); TBM_TRACE_BO("bo(%p) ref_cnt(%d)\n", bo, bo->ref_cnt - 1); if (bo->ref_cnt <= 0) { - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return; } @@ -454,7 +388,7 @@ tbm_bo_unref(tbm_bo bo) if (bo->ref_cnt == 0) _tbm_bo_free(bo); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); } tbm_bo_handle @@ -463,37 +397,44 @@ tbm_bo_map(tbm_bo bo, int device, int opt) tbm_bo_handle bo_handle; tbm_error_e error; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); + _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), (tbm_bo_handle) NULL); if (!_tbm_bo_lock(bo, device, opt)) { - _tbm_set_last_result(TBM_BO_ERROR_LOCK_FAILED); TBM_ERR("error: fail to lock bo:%p)\n", bo); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return (tbm_bo_handle) NULL; } - if (bo->bufmgr->backend_module_data) { + if (bo->bufmgr->use_hal_tbm) { + hal_tbm_bo_handle hbo_handle; + hbo_handle = hal_tbm_bo_map((hal_tbm_bo *)bo->bo_data, device, opt, (hal_tbm_error *)&error); + if (hbo_handle.ptr == NULL) { + /* LCOV_EXCL_START */ + _tbm_set_last_result(error); + TBM_ERR("error: bo(%p) bo_handle(%p) error(%d)\n", bo, hbo_handle.ptr, error); + goto bo_map_fail; + /* LCOV_EXCL_STOP */ + } + memcpy(&bo_handle.ptr, &hbo_handle.ptr, sizeof(tbm_bo_handle)); + } else if (bo->bufmgr->backend_module_data) { bo_handle = bo->bufmgr->bo_func->bo_map(bo->bo_data, device, opt, &error); if (bo_handle.ptr == NULL) { /* LCOV_EXCL_START */ - _tbm_set_last_result(TBM_BO_ERROR_MAP_FAILED); + _tbm_set_last_result(error); TBM_ERR("error: fail to map bo:%p error:%d\n", bo, error); - _tbm_bo_unlock(bo); - _tbm_bo_mutex_unlock(); - return (tbm_bo_handle) NULL; + goto bo_map_fail; /* LCOV_EXCL_STOP */ } } else { bo_handle = bo->bufmgr->backend->bo_map(bo, device, opt); if (bo_handle.ptr == NULL) { /* LCOV_EXCL_START */ - _tbm_set_last_result(TBM_BO_ERROR_MAP_FAILED); + _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION); TBM_ERR("error: fail to map bo:%p\n", bo); - _tbm_bo_unlock(bo); - _tbm_bo_mutex_unlock(); - return (tbm_bo_handle) NULL; + goto bo_map_fail; /* LCOV_EXCL_STOP */ } } @@ -503,9 +444,14 @@ tbm_bo_map(tbm_bo bo, int device, int opt) TBM_TRACE_BO("bo(%p) map_cnt(%d)\n", bo, bo->map_cnt); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return bo_handle; + +bo_map_fail: + _tbm_bo_unlock(bo); + _tbm_bufmgr_mutex_unlock(); + return (tbm_bo_handle) NULL; } int @@ -514,20 +460,30 @@ tbm_bo_unmap(tbm_bo bo) int ret = 1; tbm_error_e error; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); + _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0); TBM_BO_RETURN_VAL_IF_FAIL(bo->map_cnt > 0, 0); - if (bo->bufmgr->backend_module_data) { + if (bo->bufmgr->use_hal_tbm) { + error = (hal_tbm_error)hal_tbm_bo_unmap((hal_tbm_bo *)bo->bo_data); + if (error != TBM_ERROR_NONE) { + /* LCOV_EXCL_START */ + TBM_ERR("error: bo(%p) map_cnt(%d) error(%d)\n", bo, bo->map_cnt, error); + _tbm_set_last_result(error); + ret = 0; + goto done; + /* LCOV_EXCL_STOP */ + } + } else if (bo->bufmgr->backend_module_data) { error = bo->bufmgr->bo_func->bo_unmap(bo->bo_data); if (error != TBM_ERROR_NONE) { /* LCOV_EXCL_START */ TBM_ERR("error: bo(%p) map_cnt(%d) error(%d)\n", bo, bo->map_cnt, error); - _tbm_set_last_result(TBM_BO_ERROR_UNMAP_FAILED); + _tbm_set_last_result(error); ret = 0; - _tbm_bo_mutex_unlock(); - return ret; + goto done; /* LCOV_EXCL_STOP */ } } else { @@ -535,9 +491,8 @@ tbm_bo_unmap(tbm_bo bo) if (!ret) { /* LCOV_EXCL_START */ TBM_ERR("error: bo(%p) map_cnt(%d)\n", bo, bo->map_cnt); - _tbm_set_last_result(TBM_BO_ERROR_UNMAP_FAILED); - _tbm_bo_mutex_unlock(); - return ret; + _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION); + goto done; /* LCOV_EXCL_STOP */ } } @@ -549,7 +504,8 @@ tbm_bo_unmap(tbm_bo bo) _tbm_bo_unlock(bo); - _tbm_bo_mutex_unlock(); +done: + _tbm_bufmgr_mutex_unlock(); return ret; } @@ -560,37 +516,51 @@ tbm_bo_get_handle(tbm_bo bo, int device) tbm_bo_handle bo_handle; tbm_error_e error; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); + _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), (tbm_bo_handle) NULL); - if (bo->bufmgr->backend_module_data) { + if (bo->bufmgr->use_hal_tbm) { + hal_tbm_bo_handle hbo_handle; + hbo_handle = hal_tbm_bo_get_handle((hal_tbm_bo *)bo->bo_data, device, (hal_tbm_error *)&error); + if (hbo_handle.ptr == NULL) { + /* LCOV_EXCL_START */ + TBM_ERR("error: bo(%p) bo_handle(%p) error(%d)\n", bo, hbo_handle.ptr, error); + _tbm_set_last_result(error); + goto bo_handle_fail; + /* LCOV_EXCL_STOP */ + } + memcpy(&bo_handle.ptr, &hbo_handle.ptr, sizeof(tbm_bo_handle)); + } else if (bo->bufmgr->backend_module_data) { bo_handle = bo->bufmgr->bo_func->bo_get_handle(bo->bo_data, device, &error); if (bo_handle.ptr == NULL) { /* LCOV_EXCL_START */ - _tbm_set_last_result(TBM_BO_ERROR_GET_HANDLE_FAILED); TBM_ERR("error: bo(%p) bo_handle(%p) error(%d)\n", bo, bo_handle.ptr, error); - _tbm_bo_mutex_unlock(); - return (tbm_bo_handle) NULL; + _tbm_set_last_result(error); + goto bo_handle_fail; /* LCOV_EXCL_STOP */ } } else { bo_handle = bo->bufmgr->backend->bo_get_handle(bo, device); if (bo_handle.ptr == NULL) { /* LCOV_EXCL_START */ - _tbm_set_last_result(TBM_BO_ERROR_GET_HANDLE_FAILED); TBM_ERR("error: bo(%p) bo_handle(%p)\n", bo, bo_handle.ptr); - _tbm_bo_mutex_unlock(); - return (tbm_bo_handle) NULL; + _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION); + goto bo_handle_fail; /* LCOV_EXCL_STOP */ } } TBM_TRACE_BO("bo(%p) bo_handle(%p)\n", bo, bo_handle.ptr); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return bo_handle; + +bo_handle_fail: + _tbm_bufmgr_mutex_unlock(); + return (tbm_bo_handle) NULL; } tbm_key @@ -599,14 +569,25 @@ tbm_bo_export(tbm_bo bo) tbm_key ret; tbm_error_e error; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); + _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0); - if (bo->bufmgr->backend_module_data) { + if (bo->bufmgr->use_hal_tbm) { + ret = (hal_tbm_key)hal_tbm_bo_export_key((hal_tbm_bo *)bo->bo_data, (hal_tbm_error *)&error); + if (!ret) { + /* LCOV_EXCL_START */ + TBM_ERR("error: bo(%p) tbm_key(%d) error(%d)\n", bo, ret, error); + _tbm_set_last_result(error); + goto done; + /* LCOV_EXCL_STOP */ + } + } else if (bo->bufmgr->backend_module_data) { if (!bo->bufmgr->bo_func->bo_export_key) { /* LCOV_EXCL_START */ - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); + _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED); return 0; /* LCOV_EXCL_STOP */ } @@ -614,16 +595,16 @@ tbm_bo_export(tbm_bo bo) ret = bo->bufmgr->bo_func->bo_export_key(bo->bo_data, &error); if (!ret) { /* LCOV_EXCL_START */ - _tbm_set_last_result(TBM_BO_ERROR_EXPORT_FAILED); TBM_ERR("error: bo(%p) tbm_key(%d) error(%d)\n", bo, ret, error); - _tbm_bo_mutex_unlock(); - return ret; + _tbm_set_last_result(error); + goto done; /* LCOV_EXCL_STOP */ } } else { if (!bo->bufmgr->backend->bo_export) { /* LCOV_EXCL_START */ - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); + _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED); return 0; /* LCOV_EXCL_STOP */ } @@ -631,17 +612,17 @@ tbm_bo_export(tbm_bo bo) ret = bo->bufmgr->backend->bo_export(bo); if (!ret) { /* LCOV_EXCL_START */ - _tbm_set_last_result(TBM_BO_ERROR_EXPORT_FAILED); TBM_ERR("error: bo(%p) tbm_key(%d)\n", bo, ret); - _tbm_bo_mutex_unlock(); - return ret; + _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION); + goto done; /* LCOV_EXCL_STOP */ } } TBM_TRACE_BO("bo(%p) tbm_key(%u)\n", bo, ret); - _tbm_bo_mutex_unlock(); +done: + _tbm_bufmgr_mutex_unlock(); return ret; } @@ -652,14 +633,25 @@ tbm_bo_export_fd(tbm_bo bo) tbm_fd ret; tbm_error_e error; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); + _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), -1); - if (bo->bufmgr->backend_module_data) { + if (bo->bufmgr->use_hal_tbm) { + ret = (hal_tbm_fd)hal_tbm_bo_export_fd((hal_tbm_bo *)bo->bo_data, (hal_tbm_error *)&error); + if (ret < 0) { + /* LCOV_EXCL_START */ + TBM_ERR("error: bo(%p) tbm_fd(%d) error(%d)\n", bo, ret, error); + _tbm_set_last_result(error); + goto done; + /* LCOV_EXCL_STOP */ + } + } else if (bo->bufmgr->backend_module_data) { if (!bo->bufmgr->bo_func->bo_export_fd) { /* LCOV_EXCL_START */ - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); + _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED); return -1; /* LCOV_EXCL_STOP */ } @@ -667,16 +659,16 @@ tbm_bo_export_fd(tbm_bo bo) ret = bo->bufmgr->bo_func->bo_export_fd(bo->bo_data, &error); if (ret < 0) { /* LCOV_EXCL_START */ - _tbm_set_last_result(TBM_BO_ERROR_EXPORT_FD_FAILED); TBM_ERR("error: bo(%p) tbm_fd(%d) error(%d)\n", bo, ret, error); - _tbm_bo_mutex_unlock(); - return ret; + _tbm_set_last_result(error); + goto done; /* LCOV_EXCL_STOP */ } } else { if (!bo->bufmgr->backend->bo_export_fd) { /* LCOV_EXCL_START */ - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); + _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED); return -1; /* LCOV_EXCL_STOP */ } @@ -684,17 +676,17 @@ tbm_bo_export_fd(tbm_bo bo) ret = bo->bufmgr->backend->bo_export_fd(bo); if (ret < 0) { /* LCOV_EXCL_START */ - _tbm_set_last_result(TBM_BO_ERROR_EXPORT_FD_FAILED); TBM_ERR("error: bo(%p) tbm_fd(%d)\n", bo, ret); - _tbm_bo_mutex_unlock(); - return ret; + _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION); + goto done; /* LCOV_EXCL_STOP */ } } TBM_TRACE_BO("bo(%p) tbm_fd(%d)\n", bo, ret); - _tbm_bo_mutex_unlock(); +done: + _tbm_bufmgr_mutex_unlock(); return ret; } @@ -703,122 +695,27 @@ tbm_bo tbm_bo_import(tbm_bufmgr bufmgr, unsigned int key) { tbm_bo bo; - tbm_bo bo2 = NULL; - void *bo_priv; tbm_error_e error; - tbm_backend_bo_data *bo_data; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); + _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(bufmgr), NULL); - if (bufmgr->backend_module_data) { - if (!bufmgr->bufmgr_func->bufmgr_import_key) { - /* LCOV_EXCL_START */ - _tbm_bo_mutex_unlock(); - return NULL; - /* LCOV_EXCL_STOP */ - } - } else { - if (!bufmgr->backend->bo_import) { - /* LCOV_EXCL_START */ - _tbm_bo_mutex_unlock(); - return NULL; - /* LCOV_EXCL_STOP */ - } - } - - _tbm_util_check_bo_cnt(bufmgr); - - bo = calloc(1, sizeof(struct _tbm_bo)); + bo = tbm_bufmgr_internal_import_bo_with_key(bufmgr, key, &error); if (!bo) { /* LCOV_EXCL_START */ - TBM_ERR("error: fail to import of tbm_bo by key(%d)\n", key); - _tbm_bo_mutex_unlock(); + TBM_ERR("tbm_bufmgr_internal_import_key failed. error:%d", error); + _tbm_set_last_result(error); + _tbm_bufmgr_mutex_unlock(); return NULL; /* LCOV_EXCL_STOP */ } - bo->bufmgr = bufmgr; - - if (bo->bufmgr->backend_module_data) { - bo_data = bo->bufmgr->bufmgr_func->bufmgr_import_key(bufmgr->bufmgr_data, key, &error); - if (!bo_data) { - /* LCOV_EXCL_START */ - TBM_ERR("error: fail to import of tbm_bo by key(%d). error(%d)\n", key, error); - _tbm_set_last_result(TBM_BO_ERROR_IMPORT_FAILED); - free(bo); - _tbm_bo_mutex_unlock(); - return NULL; - /* LCOV_EXCL_STOP */ - } - - if (!LIST_IS_EMPTY(&bo->bufmgr->bo_list)) { - LIST_FOR_EACH_ENTRY(bo2, &bo->bufmgr->bo_list, item_link) { - if (bo2->bo_data == bo_data) { - TBM_TRACE_BO("find bo(%p) ref(%d) key(%d) flag(%s) in list\n", - bo2, bo2->ref_cnt, key, - _tbm_flag_to_str(bo2->flags)); - bo2->ref_cnt++; - free(bo); - _tbm_bo_mutex_unlock(); - return bo2; - } - } - } - bo->bo_data = bo_data; - } else { - bo_priv = bo->bufmgr->backend->bo_import(bo, key); - if (!bo_priv) { - /* LCOV_EXCL_START */ - TBM_ERR("error: fail to import of tbm_bo by key(%d)\n", key); - _tbm_set_last_result(TBM_BO_ERROR_IMPORT_FAILED); - free(bo); - _tbm_bo_mutex_unlock(); - return NULL; - /* LCOV_EXCL_STOP */ - } - - if (!LIST_IS_EMPTY(&bo->bufmgr->bo_list)) { - LIST_FOR_EACH_ENTRY(bo2, &bo->bufmgr->bo_list, item_link) { - if (bo2->priv == bo_priv) { - TBM_TRACE_BO("find bo(%p) ref(%d) key(%d) flag(%s) in list\n", - bo2, bo2->ref_cnt, key, - _tbm_flag_to_str(bo2->flags)); - bo2->ref_cnt++; - free(bo); - _tbm_bo_mutex_unlock(); - return bo2; - } - } - } - bo->priv = bo_priv; - } - - bo->bufmgr->bo_cnt++; - bo->ref_cnt = 1; - - if (bo->bufmgr->backend_module_data) { - bo->flags = bo->bufmgr->bo_func->bo_get_memory_types(bo->bo_data, &error); - if (error != TBM_ERROR_NONE) { - TBM_ERR("fail to get the bo flags(memory_types)"); - bo->flags = TBM_BO_DEFAULT; - } - } else { - if (bo->bufmgr->backend->bo_get_flags) - bo->flags = bo->bufmgr->backend->bo_get_flags(bo); - else - bo->flags = TBM_BO_DEFAULT; - } - TBM_TRACE_BO("import new bo(%p) ref(%d) key(%d) flag(%s) in list\n", bo, bo->ref_cnt, key, _tbm_flag_to_str(bo->flags)); - LIST_INITHEAD(&bo->user_data_list); - - LIST_ADD(&bo->item_link, &bo->bufmgr->bo_list); - - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return bo; } @@ -827,122 +724,29 @@ tbm_bo tbm_bo_import_fd(tbm_bufmgr bufmgr, tbm_fd fd) { tbm_bo bo; - tbm_bo bo2 = NULL; - void *bo_priv; - tbm_backend_bo_data *bo_data; tbm_error_e error; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); + _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(bufmgr), NULL); - if (bufmgr->backend_module_data) { - if (!bufmgr->bufmgr_func->bufmgr_import_fd) { - /* LCOV_EXCL_START */ - _tbm_bo_mutex_unlock(); - return NULL; - /* LCOV_EXCL_STOP */ - } - } else { - if (!bufmgr->backend->bo_import_fd) { - /* LCOV_EXCL_START */ - _tbm_bo_mutex_unlock(); - return NULL; - /* LCOV_EXCL_STOP */ - } - } - - _tbm_util_check_bo_cnt(bufmgr); - - bo = calloc(1, sizeof(struct _tbm_bo)); + bo = tbm_bufmgr_internal_import_bo_with_fd(bufmgr, fd, &error); if (!bo) { /* LCOV_EXCL_START */ - TBM_ERR("error: fail to import tbm_bo by tbm_fd(%d)\n", fd); - _tbm_bo_mutex_unlock(); + TBM_ERR("tbm_bufmgr_internal_import_fd failed. error:%d", error); + _tbm_set_last_result(error); + _tbm_bufmgr_mutex_unlock(); return NULL; /* LCOV_EXCL_STOP */ } - bo->bufmgr = bufmgr; - - if (bo->bufmgr->backend_module_data) { - bo_data = bo->bufmgr->bufmgr_func->bufmgr_import_fd(bufmgr->bufmgr_data, fd, &error); - if (!bo_data) { - /* LCOV_EXCL_START */ - TBM_ERR("error: fail to import tbm_bo by tbm_fd(%d). error(%d)\n", fd, error); - _tbm_set_last_result(TBM_BO_ERROR_IMPORT_FD_FAILED); - free(bo); - _tbm_bo_mutex_unlock(); - return NULL; - /* LCOV_EXCL_STOP */ - } - - if (!LIST_IS_EMPTY(&bo->bufmgr->bo_list)) { - LIST_FOR_EACH_ENTRY(bo2, &bo->bufmgr->bo_list, item_link) { - if (bo2->bo_data == bo_data) { - TBM_TRACE_BO("find bo(%p) ref(%d) fd(%d) flag(%s) in list\n", - bo2, bo2->ref_cnt, fd, - _tbm_flag_to_str(bo2->flags)); - bo2->ref_cnt++; - free(bo); - _tbm_bo_mutex_unlock(); - return bo2; - } - } - } - bo->bo_data = bo_data; - } else { - bo_priv = bo->bufmgr->backend->bo_import_fd(bo, fd); - if (!bo_priv) { - /* LCOV_EXCL_START */ - TBM_ERR("error: fail to import tbm_bo by tbm_fd(%d)\n", fd); - _tbm_set_last_result(TBM_BO_ERROR_IMPORT_FD_FAILED); - free(bo); - _tbm_bo_mutex_unlock(); - return NULL; - /* LCOV_EXCL_STOP */ - } - - if (!LIST_IS_EMPTY(&bo->bufmgr->bo_list)) { - LIST_FOR_EACH_ENTRY(bo2, &bo->bufmgr->bo_list, item_link) { - if (bo2->priv == bo_priv) { - TBM_TRACE_BO("find bo(%p) ref(%d) fd(%d) flag(%s) in list\n", - bo2, bo2->ref_cnt, fd, - _tbm_flag_to_str(bo2->flags)); - bo2->ref_cnt++; - free(bo); - _tbm_bo_mutex_unlock(); - return bo2; - } - } - } - bo->priv = bo_priv; - } - - bo->bufmgr->bo_cnt++; - bo->ref_cnt = 1; - - if (bo->bufmgr->backend_module_data) { - bo->flags = bo->bufmgr->bo_func->bo_get_memory_types(bo->bo_data, &error); - if (error != TBM_ERROR_NONE) { - TBM_ERR("fail to get the bo flags(memory_types)"); - bo->flags = TBM_BO_DEFAULT; - } - } else { - if (bo->bufmgr->backend->bo_get_flags) - bo->flags = bo->bufmgr->backend->bo_get_flags(bo); - else - bo->flags = TBM_BO_DEFAULT; - } + LIST_INITHEAD(&bo->user_data_list); // TODO: remove this. build-break when it is removed. TBM_TRACE_BO("import bo(%p) ref(%d) fd(%d) flag(%s)\n", bo, bo->ref_cnt, fd, _tbm_flag_to_str(bo->flags)); - LIST_INITHEAD(&bo->user_data_list); - - LIST_ADD(&bo->item_link, &bo->bufmgr->bo_list); - - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return bo; } @@ -953,20 +757,29 @@ tbm_bo_size(tbm_bo bo) int size; tbm_error_e error; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); + _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0); - if (bo->bufmgr->backend_module_data) { + if (bo->bufmgr->use_hal_tbm) { + size = hal_tbm_bo_get_size((hal_tbm_bo *)bo->bo_data, (hal_tbm_error *)&error); + if (error != TBM_ERROR_NONE) { + TBM_ERR("fail to get the size of the bo_data(%d).", error); + _tbm_set_last_result(TBM_ERROR_NONE); + } + } else if (bo->bufmgr->backend_module_data) { size = bo->bufmgr->bo_func->bo_get_size(bo->bo_data, &error); - if (error != TBM_ERROR_NONE) + if (error != TBM_ERROR_NONE) { TBM_ERR("fail to get the size of the bo_data(%d).", error); + _tbm_set_last_result(TBM_ERROR_NONE); + } } else size = bo->bufmgr->backend->bo_size(bo); TBM_TRACE_BO("bo(%p) size(%d)\n", bo, size); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return size; } @@ -974,24 +787,26 @@ tbm_bo_size(tbm_bo bo) int tbm_bo_locked(tbm_bo bo) { - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); + _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0); if (bo->bufmgr->bo_lock_type == TBM_BUFMGR_BO_LOCK_TYPE_NEVER) { TBM_ERR("bo(%p) lock_cnt(%d)\n", bo, bo->lock_cnt); - _tbm_bo_mutex_unlock(); + _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION); + _tbm_bufmgr_mutex_unlock(); return 0; } if (bo->lock_cnt > 0) { TBM_TRACE_BO("error: bo(%p) lock_cnt(%d)\n", bo, bo->lock_cnt); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 1; } TBM_TRACE_BO("bo(%p) lock_cnt(%d)\n", bo, bo->lock_cnt); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 0; } @@ -1003,22 +818,38 @@ tbm_bo_swap(tbm_bo bo1, tbm_bo bo2) int size1 = -1, size2 = -2; void *temp; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); + _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo1), 0); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo2), 0); TBM_TRACE_BO("before: bo1(%p) bo2(%p)\n", bo1, bo2); - if (bo1->bufmgr->backend_module_data) { + if (bo1->bufmgr->use_hal_tbm) { + size1 = hal_tbm_bo_get_size((hal_tbm_bo *)bo1->bo_data, (hal_tbm_error *)&error1); + if (error1 != TBM_ERROR_NONE) { + TBM_ERR("fail to get the size of bo1.(%d)", error1); + _tbm_set_last_result(error1); + goto fail; + } + size2 = hal_tbm_bo_get_size((hal_tbm_bo *)bo2->bo_data, (hal_tbm_error *)&error2); + if (error2 != TBM_ERROR_NONE) { + TBM_ERR("fail to get the size of bo1.(%d)", error2); + _tbm_set_last_result(error2); + goto fail; + } + } else if (bo1->bufmgr->backend_module_data) { size1 = bo1->bufmgr->bo_func->bo_get_size(bo1->bo_data, &error1); if (error1 != TBM_ERROR_NONE) { TBM_ERR("fail to get the size of bo1.(%d)", error1); + _tbm_set_last_result(error1); goto fail; } size2 = bo2->bufmgr->bo_func->bo_get_size(bo2->bo_data, &error2); if (error2 != TBM_ERROR_NONE) { TBM_ERR("fail to get the size of bo2.(%d)", error2); + _tbm_set_last_result(error2); goto fail; } } else { @@ -1028,6 +859,7 @@ tbm_bo_swap(tbm_bo bo1, tbm_bo bo2) if (size1 != size2) { TBM_ERR("error: bo1 size(%d) and bo2 size(%d) is different.", size1, size2); + _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION); goto fail; } @@ -1037,14 +869,13 @@ tbm_bo_swap(tbm_bo bo1, tbm_bo bo2) bo1->priv = bo2->priv; bo2->priv = temp; - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 1; fail: - _tbm_set_last_result(TBM_BO_ERROR_SWAP_FAILED); TBM_ERR("error: bo1(%p) bo2(%p)\n", bo1, bo2); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 0; } @@ -1055,7 +886,8 @@ tbm_bo_add_user_data(tbm_bo bo, unsigned long key, { tbm_user_data *data; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); + _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0); @@ -1063,14 +895,16 @@ tbm_bo_add_user_data(tbm_bo bo, unsigned long key, data = user_data_lookup(&bo->user_data_list, key); if (data) { TBM_TRACE_BO("warning: user data already exist key(%ld)\n", key); - _tbm_bo_mutex_unlock(); + _tbm_set_last_result(TBM_ERROR_INVALID_PARAMETER); + _tbm_bufmgr_mutex_unlock(); return 0; } data = user_data_create(key, data_free_func); if (!data) { TBM_ERR("error: bo(%p) key(%lu)\n", bo, key); - _tbm_bo_mutex_unlock(); + _tbm_set_last_result(TBM_ERROR_INVALID_PARAMETER); + _tbm_bufmgr_mutex_unlock(); return 0; } @@ -1078,7 +912,7 @@ tbm_bo_add_user_data(tbm_bo bo, unsigned long key, LIST_ADD(&data->item_link, &bo->user_data_list); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 1; } @@ -1088,20 +922,23 @@ tbm_bo_delete_user_data(tbm_bo bo, unsigned long key) { tbm_user_data *old_data; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); + _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0); if (LIST_IS_EMPTY(&bo->user_data_list)) { - TBM_TRACE_BO("error: bo(%p) key(%lu)\n", bo, key); - _tbm_bo_mutex_unlock(); + TBM_TRACE_BO("bo(%p) key(%lu)\n", bo, key); + _tbm_set_last_result(TBM_ERROR_INVALID_PARAMETER); + _tbm_bufmgr_mutex_unlock(); return 0; } old_data = user_data_lookup(&bo->user_data_list, key); if (!old_data) { - TBM_TRACE_BO("error: bo(%p) key(%lu)\n", bo, key); - _tbm_bo_mutex_unlock(); + TBM_TRACE_BO("bo(%p) key(%lu)\n", bo, key); + _tbm_set_last_result(TBM_ERROR_INVALID_PARAMETER); + _tbm_bufmgr_mutex_unlock(); return 0; } @@ -1109,7 +946,7 @@ tbm_bo_delete_user_data(tbm_bo bo, unsigned long key) user_data_delete(old_data); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 1; } @@ -1119,20 +956,23 @@ tbm_bo_set_user_data(tbm_bo bo, unsigned long key, void *data) { tbm_user_data *old_data; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); + _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0); if (LIST_IS_EMPTY(&bo->user_data_list)) { TBM_TRACE_BO("error: bo(%p) key(%lu)\n", bo, key); - _tbm_bo_mutex_unlock(); + _tbm_set_last_result(TBM_ERROR_INVALID_PARAMETER); + _tbm_bufmgr_mutex_unlock(); return 0; } old_data = user_data_lookup(&bo->user_data_list, key); if (!old_data) { TBM_TRACE_BO("error: bo(%p) key(%lu)\n", bo, key); - _tbm_bo_mutex_unlock(); + _tbm_set_last_result(TBM_ERROR_INVALID_PARAMETER); + _tbm_bufmgr_mutex_unlock(); return 0; } @@ -1142,7 +982,7 @@ tbm_bo_set_user_data(tbm_bo bo, unsigned long key, void *data) TBM_TRACE_BO("bo(%p) key(%lu) data(%p)\n", bo, key, old_data->data); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 1; } @@ -1152,21 +992,24 @@ tbm_bo_get_user_data(tbm_bo bo, unsigned long key, void **data) { tbm_user_data *old_data; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); + _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0); if (!data || LIST_IS_EMPTY(&bo->user_data_list)) { TBM_TRACE_BO("error: bo(%p) key(%lu)\n", bo, key); - _tbm_bo_mutex_unlock(); + _tbm_set_last_result(TBM_ERROR_INVALID_PARAMETER); + _tbm_bufmgr_mutex_unlock(); return 0; } old_data = user_data_lookup(&bo->user_data_list, key); if (!old_data) { - TBM_TRACE_BO("error: bo(%p) key(%lu)\n", bo, key); *data = NULL; - _tbm_bo_mutex_unlock(); + TBM_TRACE_BO("error: bo(%p) key(%lu)\n", bo, key); + _tbm_set_last_result(TBM_ERROR_INVALID_PARAMETER); + _tbm_bufmgr_mutex_unlock(); return 0; } @@ -1174,25 +1017,17 @@ tbm_bo_get_user_data(tbm_bo bo, unsigned long key, void **data) TBM_TRACE_BO("bo(%p) key(%lu) data(%p)\n", bo, key, old_data->data); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 1; } -/* LCOV_EXCL_START */ -tbm_error_e -tbm_get_last_error(void) -{ - return tbm_last_error; -} -/* LCOV_EXCL_STOP */ - int tbm_bo_get_flags(tbm_bo bo) { int flags; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0); @@ -1200,7 +1035,7 @@ tbm_bo_get_flags(tbm_bo bo) TBM_TRACE_BO("bo(%p)\n", bo); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return flags; } @@ -1210,13 +1045,13 @@ tbm_bo_get_flags(tbm_bo bo) int _tbm_bo_set_surface(tbm_bo bo, tbm_surface_h surface) { - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0); bo->surface = surface; - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 1; } @@ -1242,7 +1077,15 @@ _tbm_bo_free(tbm_bo bo) } /* call the bo_free */ - if (bo->bufmgr->backend_module_data) { + if (bo->bufmgr->use_hal_tbm) { + // call hal_tbm_bo_free when bo is created by tbm_bo_alloc api. + if (!bo->get_from_hal_surface) { + bo->get_from_hal_surface = 0; + + hal_tbm_bo_free(bo->bo_data); + bo->bo_data = NULL; + } + } else if (bo->bufmgr->backend_module_data) { bo->bufmgr->bo_func->bo_free(bo->bo_data); bo->bo_data = NULL; } else { @@ -1250,9 +1093,8 @@ _tbm_bo_free(tbm_bo bo) bo->priv = NULL; } - bo->bufmgr->bo_cnt--; + _tbm_bo_deinit(bo); - LIST_DEL(&bo->item_link); free(bo); } /* LCOV_EXCL_STOP */