X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Ftbm_bo.c;h=6d988cba30f20d5d12f59285d75692be8a8fded8;hb=594f8abb1b73783cfdf3fe982fcf7ea932f0bad7;hp=7e190b160cb49aff45d2af1ed633470ee276c290;hpb=7d522cc28f64715dc9a2f19eb84cad8f45f8cba6;p=platform%2Fcore%2Fuifw%2Flibtbm.git diff --git a/src/tbm_bo.c b/src/tbm_bo.c index 7e190b1..6d988cb 100644 --- a/src/tbm_bo.c +++ b/src/tbm_bo.c @@ -34,6 +34,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "tbm_bufmgr_int.h" #include "list.h" +#define TBM_BO_MAGIC 0xBF011234 + /* check condition */ #define TBM_BO_RETURN_IF_FAIL(cond) {\ if (!(cond)) {\ @@ -153,7 +155,18 @@ _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) { @@ -178,7 +191,17 @@ _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) { @@ -280,42 +303,57 @@ _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->magic != TBM_BO_MAGIC) + return 0; + + return 1; +} - if (bo == NULL) { +static int +_tbm_bo_is_valid(tbm_bo bo) +{ + if (!bo) { TBM_ERR("error: bo is NULL.\n"); return 0; } - bufmgr = tbm_bufmgr_get(); - if (bufmgr == NULL) { - TBM_ERR("error: bufmgr is NULL.\n"); + if (!_tbm_bo_magic_check(bo)) { + TBM_ERR("error: No valid bo(%p).\n", bo); return 0; } - if (LIST_IS_EMPTY(&bufmgr->bo_list)) { - TBM_ERR("error: bo->bo->bufmgr->bo_list is EMPTY.\n"); - return 0; - } + return 1; +} - LIST_FOR_EACH_ENTRY(old_data, &bufmgr->bo_list, item_link) { - if (old_data == bo) - return 1; - } +static void +_tbm_bo_init(tbm_bufmgr bufmgr, tbm_bo bo, int flags) +{ + bo->bufmgr = bufmgr; + bo->flags = flags; + bo->magic = TBM_BO_MAGIC; + bo->ref_cnt = 1; - TBM_ERR("error: No valid bo(%p).\n", bo); + LIST_INITHEAD(&bo->user_data_list); - return 0; + bufmgr->bo_cnt++; + LIST_ADD(&bo->item_link, &bufmgr->bo_list); +} + +static void +_tbm_bo_deinit(tbm_bo bo) +{ + bo->magic = 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; @@ -328,8 +366,6 @@ tbm_bo_alloc(tbm_bufmgr bufmgr, int size, int flags) bo = calloc(1, sizeof(struct _tbm_bo)); 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_ERROR_OUT_OF_MEMORY); _tbm_bufmgr_mutex_unlock(); return NULL; @@ -338,52 +374,130 @@ tbm_bo_alloc(tbm_bufmgr bufmgr, int size, int flags) _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(error); - free(bo); - _tbm_bufmgr_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_ERROR_INVALID_OPERATION); - free(bo); - _tbm_bufmgr_mutex_unlock(); - return NULL; - /* LCOV_EXCL_STOP */ - } - bo->priv = bo_priv; + bo_data = tbm_module_bufmgr_bo_alloc(bufmgr->module, bo, size, flags, &error); + if (!bo_data || error != TBM_ERROR_NONE) { + /* LCOV_EXCL_START */ + TBM_ERR("tbm_module_bufmgr_bo_alloc failed. error:%d", error); + _tbm_set_last_result(error); + goto alloc_fail; + /* LCOV_EXCL_STOP */ } + bo->bo_data = bo_data; + bo->priv = (void *)bo_data; // TODO: this will be DEPRECATED. - bo->bufmgr->bo_cnt++; - bo->ref_cnt = 1; - bo->flags = flags; + _tbm_bo_init(bufmgr, bo, 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); + _tbm_bufmgr_mutex_unlock(); - LIST_ADD(&bo->item_link, &bo->bufmgr->bo_list); + return bo; + +alloc_fail: + TBM_ERR("error: fail to create of tbm_bo size(%d) flag(%s)\n", size, _tbm_flag_to_str(flags)); + free(bo); + _tbm_bufmgr_mutex_unlock(); + return NULL; +} + +/* LCOV_EXCL_START */ +tbm_bo +tbm_bo_alloc_with_format(tbm_bufmgr bufmgr, int format, int bo_idx, int width, + int height, int bpp, tbm_bo_memory_type flags, tbm_error_e *error) +{ + tbm_bo bo = NULL; + + _tbm_bufmgr_mutex_lock(); + _tbm_set_last_result(TBM_ERROR_NONE); + + TBM_BO_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(bufmgr), NULL); + + bo = calloc(1, sizeof(struct _tbm_bo)); + if (!bo) { + /* LCOV_EXCL_START */ + TBM_ERR("error: fail to tbm_bo_alloc_with_format fmt(%s) idx(%d) w(%d) h(%d) mem_types(%s)\n", + FOURCC_STR(format), bo_idx, width, height, _tbm_flag_to_str(flags)); + _tbm_set_last_result(TBM_ERROR_OUT_OF_MEMORY); + /* LCOV_EXCL_STOP */ + goto fail; + } + + _tbm_util_check_bo_cnt(bufmgr); + + bo->bo_data = tbm_module_bufmgr_bo_alloc_with_format(bufmgr->module, format, bo_idx, width, height, bpp, flags, error); + if (!bo->bo_data) { + /* LCOV_EXCL_START */ + TBM_ERR("tbm_module_bufmgr_bo_alloc_with_format failed. fmt:%d idx:%d wxh:%dx%d mem_types:%s\n", + format, bo_idx, width, height, _tbm_flag_to_str(flags)); + _tbm_set_last_result(*error); + /* LCOV_EXCL_STOP */ + goto fail; + } + + _tbm_bo_init(bufmgr, bo, flags); + + _tbm_bufmgr_mutex_unlock(); + + return bo; + +fail: + if (bo) + free(bo); + _tbm_bufmgr_mutex_unlock(); + + return NULL; +} + +tbm_bo +tbm_bo_alloc_with_bo_data(tbm_bufmgr bufmgr, tbm_backend_bo_data *bo_data, int flags) +{ + tbm_bo bo, bo2 = NULL; + + _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(bo_data, NULL); + + // return an existed bo if the bo is already created with the same bo_data. + if (!LIST_IS_EMPTY(&bufmgr->bo_list)) { + LIST_FOR_EACH_ENTRY(bo2, &bufmgr->bo_list, item_link) { + if (bo2->bo_data == bo_data) { + TBM_ERR("find bo(%p) ref(%d) flag(%s) in list\n", + bo2, bo2->ref_cnt, _tbm_flag_to_str(bo2->flags)); + bo2->ref_cnt++; + _tbm_bufmgr_mutex_unlock(); + return bo2; + } + } + } + + bo = calloc(1, sizeof(struct _tbm_bo)); + if (!bo) { + /* LCOV_EXCL_START */ + _tbm_set_last_result(TBM_ERROR_OUT_OF_MEMORY); + _tbm_bufmgr_mutex_unlock(); + return NULL; + /* LCOV_EXCL_STOP */ + } + + _tbm_util_check_bo_cnt(bufmgr); + + bo->get_from_hal_surface = 1; + bo->bo_data = bo_data; + + _tbm_bo_init(bufmgr, bo, flags); + + TBM_TRACE_BO("bo(%p) refcnt(%d), flag(%s)\n", bo, bo->ref_cnt, _tbm_flag_to_str(bo->flags)); _tbm_bufmgr_mutex_unlock(); return bo; } +/* LCOV_EXCL_STOP */ + tbm_bo tbm_bo_ref(tbm_bo bo) { @@ -440,15 +554,24 @@ tbm_bo_map(tbm_bo bo, int device, int opt) 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(error); TBM_ERR("error: fail to map bo:%p error:%d\n", bo, error); - _tbm_bo_unlock(bo); - _tbm_bufmgr_mutex_unlock(); - return (tbm_bo_handle) NULL; + goto bo_map_fail; /* LCOV_EXCL_STOP */ } } else { @@ -457,9 +580,7 @@ tbm_bo_map(tbm_bo bo, int device, int opt) /* LCOV_EXCL_START */ _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION); TBM_ERR("error: fail to map bo:%p\n", bo); - _tbm_bo_unlock(bo); - _tbm_bufmgr_mutex_unlock(); - return (tbm_bo_handle) NULL; + goto bo_map_fail; /* LCOV_EXCL_STOP */ } } @@ -472,6 +593,11 @@ tbm_bo_map(tbm_bo bo, int device, int opt) _tbm_bufmgr_mutex_unlock(); return bo_handle; + +bo_map_fail: + _tbm_bo_unlock(bo); + _tbm_bufmgr_mutex_unlock(); + return (tbm_bo_handle) NULL; } int @@ -486,15 +612,24 @@ tbm_bo_unmap(tbm_bo bo) 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(error); ret = 0; - _tbm_bufmgr_mutex_unlock(); - return ret; + goto done; /* LCOV_EXCL_STOP */ } } else { @@ -503,8 +638,7 @@ tbm_bo_unmap(tbm_bo bo) /* LCOV_EXCL_START */ TBM_ERR("error: bo(%p) map_cnt(%d)\n", bo, bo->map_cnt); _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION); - _tbm_bufmgr_mutex_unlock(); - return ret; + goto done; /* LCOV_EXCL_STOP */ } } @@ -516,6 +650,7 @@ tbm_bo_unmap(tbm_bo bo) _tbm_bo_unlock(bo); +done: _tbm_bufmgr_mutex_unlock(); return ret; @@ -532,14 +667,24 @@ tbm_bo_get_handle(tbm_bo bo, int device) 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_ERR("error: bo(%p) bo_handle(%p) error(%d)\n", bo, bo_handle.ptr, error); _tbm_set_last_result(error); - _tbm_bufmgr_mutex_unlock(); - return (tbm_bo_handle) NULL; + goto bo_handle_fail; /* LCOV_EXCL_STOP */ } } else { @@ -548,8 +693,7 @@ tbm_bo_get_handle(tbm_bo bo, int device) /* LCOV_EXCL_START */ TBM_ERR("error: bo(%p) bo_handle(%p)\n", bo, bo_handle.ptr); _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION); - _tbm_bufmgr_mutex_unlock(); - return (tbm_bo_handle) NULL; + goto bo_handle_fail; /* LCOV_EXCL_STOP */ } } @@ -559,6 +703,10 @@ tbm_bo_get_handle(tbm_bo bo, int device) _tbm_bufmgr_mutex_unlock(); return bo_handle; + +bo_handle_fail: + _tbm_bufmgr_mutex_unlock(); + return (tbm_bo_handle) NULL; } tbm_key @@ -572,7 +720,16 @@ tbm_bo_export(tbm_bo bo) 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_bufmgr_mutex_unlock(); @@ -586,8 +743,7 @@ tbm_bo_export(tbm_bo bo) /* LCOV_EXCL_START */ TBM_ERR("error: bo(%p) tbm_key(%d) error(%d)\n", bo, ret, error); _tbm_set_last_result(error); - _tbm_bufmgr_mutex_unlock(); - return ret; + goto done; /* LCOV_EXCL_STOP */ } } else { @@ -604,14 +760,14 @@ tbm_bo_export(tbm_bo bo) /* LCOV_EXCL_START */ TBM_ERR("error: bo(%p) tbm_key(%d)\n", bo, ret); _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION); - _tbm_bufmgr_mutex_unlock(); - return ret; + goto done; /* LCOV_EXCL_STOP */ } } TBM_TRACE_BO("bo(%p) tbm_key(%u)\n", bo, ret); +done: _tbm_bufmgr_mutex_unlock(); return ret; @@ -628,7 +784,16 @@ tbm_bo_export_fd(tbm_bo bo) 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_bufmgr_mutex_unlock(); @@ -642,8 +807,7 @@ tbm_bo_export_fd(tbm_bo bo) /* LCOV_EXCL_START */ TBM_ERR("error: bo(%p) tbm_fd(%d) error(%d)\n", bo, ret, error); _tbm_set_last_result(error); - _tbm_bufmgr_mutex_unlock(); - return ret; + goto done; /* LCOV_EXCL_STOP */ } } else { @@ -660,14 +824,14 @@ tbm_bo_export_fd(tbm_bo bo) /* LCOV_EXCL_START */ TBM_ERR("error: bo(%p) tbm_fd(%d)\n", bo, ret); _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION); - _tbm_bufmgr_mutex_unlock(); - return ret; + goto done; /* LCOV_EXCL_STOP */ } } TBM_TRACE_BO("bo(%p) tbm_fd(%d)\n", bo, ret); +done: _tbm_bufmgr_mutex_unlock(); return ret; @@ -681,27 +845,30 @@ tbm_bo_import(tbm_bufmgr bufmgr, unsigned int key) void *bo_priv; tbm_error_e error; tbm_backend_bo_data *bo_data; + int flags; _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_bufmgr_mutex_unlock(); - _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED); - return NULL; - /* LCOV_EXCL_STOP */ - } - } else { - if (!bufmgr->backend->bo_import) { - /* LCOV_EXCL_START */ - _tbm_bufmgr_mutex_unlock(); - _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED); - return NULL; - /* LCOV_EXCL_STOP */ + if (!bufmgr->use_hal_tbm) { + if (bufmgr->backend_module_data) { + if (!bufmgr->bufmgr_func->bufmgr_import_key) { + /* LCOV_EXCL_START */ + _tbm_bufmgr_mutex_unlock(); + _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED); + return NULL; + /* LCOV_EXCL_STOP */ + } + } else { + if (!bufmgr->backend->bo_import) { + /* LCOV_EXCL_START */ + _tbm_bufmgr_mutex_unlock(); + _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED); + return NULL; + /* LCOV_EXCL_STOP */ + } } } @@ -717,22 +884,41 @@ tbm_bo_import(tbm_bufmgr bufmgr, unsigned int key) /* 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 (bufmgr->use_hal_tbm) { + bo_data = (tbm_backend_bo_data *)hal_tbm_bufmgr_import_key(bufmgr->hal_bufmgr, key, (hal_tbm_error *)&error); + /* LCOV_EXCL_START */ + if (!bo_data) { + TBM_ERR("error: fail to import of tbm_bo by key(%d). error(%d)\n", key, error); + _tbm_set_last_result(error); + goto import_fail; + } + /* LCOV_EXCL_STOP */ + if (!LIST_IS_EMPTY(&bufmgr->bo_list)) { + LIST_FOR_EACH_ENTRY(bo2, &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_bufmgr_mutex_unlock(); + return bo2; + } + } + } + bo->bo_data = bo_data; + } else if (bufmgr->backend_module_data) { + bo_data = 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(error); - free(bo); - _tbm_bufmgr_mutex_unlock(); - return NULL; + goto import_fail; /* LCOV_EXCL_STOP */ } - if (!LIST_IS_EMPTY(&bo->bufmgr->bo_list)) { - LIST_FOR_EACH_ENTRY(bo2, &bo->bufmgr->bo_list, item_link) { + if (!LIST_IS_EMPTY(&bufmgr->bo_list)) { + LIST_FOR_EACH_ENTRY(bo2, &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, @@ -746,19 +932,17 @@ tbm_bo_import(tbm_bufmgr bufmgr, unsigned int key) } bo->bo_data = bo_data; } else { - bo_priv = bo->bufmgr->backend->bo_import(bo, key); + bo_priv = 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_ERROR_INVALID_OPERATION); - free(bo); - _tbm_bufmgr_mutex_unlock(); - return NULL; + goto import_fail; /* LCOV_EXCL_STOP */ } - if (!LIST_IS_EMPTY(&bo->bufmgr->bo_list)) { - LIST_FOR_EACH_ENTRY(bo2, &bo->bufmgr->bo_list, item_link) { + if (!LIST_IS_EMPTY(&bufmgr->bo_list)) { + LIST_FOR_EACH_ENTRY(bo2, &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, @@ -773,33 +957,40 @@ tbm_bo_import(tbm_bufmgr bufmgr, unsigned int key) 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 (bufmgr->use_hal_tbm) { + flags = (tbm_bo_memory_type)hal_tbm_bo_get_memory_types((hal_tbm_bo *)bo->bo_data, (hal_tbm_error *)&error); if (error != TBM_ERROR_NONE) { TBM_ERR("fail to get the bo flags(memory_types)"); _tbm_set_last_result(error); - bo->flags = TBM_BO_DEFAULT; + flags = TBM_BO_DEFAULT; + } + } else if (bufmgr->backend_module_data) { + flags = 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)"); + _tbm_set_last_result(error); + flags = TBM_BO_DEFAULT; } } else { - if (bo->bufmgr->backend->bo_get_flags) - bo->flags = bo->bufmgr->backend->bo_get_flags(bo); + if (bufmgr->backend->bo_get_flags) + flags = bufmgr->backend->bo_get_flags(bo); else - bo->flags = TBM_BO_DEFAULT; + flags = TBM_BO_DEFAULT; } + _tbm_bo_init(bufmgr, bo, flags); + 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_bufmgr_mutex_unlock(); return bo; + +import_fail: + free(bo); + _tbm_bufmgr_mutex_unlock(); + return NULL; } tbm_bo @@ -810,27 +1001,30 @@ tbm_bo_import_fd(tbm_bufmgr bufmgr, tbm_fd fd) void *bo_priv; tbm_backend_bo_data *bo_data; tbm_error_e error; + int flags; _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_bufmgr_mutex_unlock(); - _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED); - return NULL; - /* LCOV_EXCL_STOP */ - } - } else { - if (!bufmgr->backend->bo_import_fd) { - /* LCOV_EXCL_START */ - _tbm_bufmgr_mutex_unlock(); - _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED); - return NULL; - /* LCOV_EXCL_STOP */ + if (!bufmgr->use_hal_tbm) { + if (bufmgr->backend_module_data) { + if (!bufmgr->bufmgr_func->bufmgr_import_fd) { + /* LCOV_EXCL_START */ + _tbm_bufmgr_mutex_unlock(); + _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED); + return NULL; + /* LCOV_EXCL_STOP */ + } + } else { + if (!bufmgr->backend->bo_import_fd) { + /* LCOV_EXCL_START */ + _tbm_bufmgr_mutex_unlock(); + _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED); + return NULL; + /* LCOV_EXCL_STOP */ + } } } @@ -846,26 +1040,44 @@ tbm_bo_import_fd(tbm_bufmgr bufmgr, tbm_fd fd) /* LCOV_EXCL_STOP */ } - bo->bufmgr = bufmgr; + if (bufmgr->use_hal_tbm) { + bo_data = (tbm_backend_bo_data *)hal_tbm_bufmgr_import_fd(bufmgr->hal_bufmgr, (hal_tbm_fd)fd, (hal_tbm_error *)&error); + /* LCOV_EXCL_START */ + if (!bo_data) { + TBM_ERR("error: fail to import tbm_bo by tbm_fd(%d). error(%d)\n", fd, error); + _tbm_set_last_result(error); + goto import_fail; + } + /* LCOV_EXCL_STOP */ - if (bo->bufmgr->backend_module_data) { - bo_data = bo->bufmgr->bufmgr_func->bufmgr_import_fd(bufmgr->bufmgr_data, fd, &error); + if (!LIST_IS_EMPTY(&bufmgr->bo_list)) { + LIST_FOR_EACH_ENTRY(bo2, &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_bufmgr_mutex_unlock(); + return bo2; + } + } + } + bo->bo_data = bo_data; + } else if (bufmgr->backend_module_data) { + bo_data = 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(error); - free(bo); - _tbm_bufmgr_mutex_unlock(); - return NULL; + goto import_fail; /* LCOV_EXCL_STOP */ } - if (!LIST_IS_EMPTY(&bo->bufmgr->bo_list)) { - LIST_FOR_EACH_ENTRY(bo2, &bo->bufmgr->bo_list, item_link) { + if (!LIST_IS_EMPTY(&bufmgr->bo_list)) { + LIST_FOR_EACH_ENTRY(bo2, &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, bo2->ref_cnt, fd, _tbm_flag_to_str(bo2->flags)); bo2->ref_cnt++; free(bo); _tbm_bufmgr_mutex_unlock(); @@ -875,23 +1087,20 @@ tbm_bo_import_fd(tbm_bufmgr bufmgr, tbm_fd fd) } bo->bo_data = bo_data; } else { - bo_priv = bo->bufmgr->backend->bo_import_fd(bo, fd); + bo_priv = 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_ERROR_INVALID_OPERATION); - free(bo); - _tbm_bufmgr_mutex_unlock(); - return NULL; + goto import_fail; /* LCOV_EXCL_STOP */ } - if (!LIST_IS_EMPTY(&bo->bufmgr->bo_list)) { - LIST_FOR_EACH_ENTRY(bo2, &bo->bufmgr->bo_list, item_link) { + if (!LIST_IS_EMPTY(&bufmgr->bo_list)) { + LIST_FOR_EACH_ENTRY(bo2, &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, bo2->ref_cnt, fd, _tbm_flag_to_str(bo2->flags)); bo2->ref_cnt++; free(bo); _tbm_bufmgr_mutex_unlock(); @@ -902,33 +1111,40 @@ tbm_bo_import_fd(tbm_bufmgr bufmgr, tbm_fd fd) 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 (bufmgr->use_hal_tbm) { + flags = (tbm_bo_memory_type)hal_tbm_bo_get_memory_types((hal_tbm_bo *)bo->bo_data, (hal_tbm_error *)&error); + if (error != TBM_ERROR_NONE) { + TBM_ERR("fail to get the bo flags(memory_types)"); + _tbm_set_last_result(error); + flags = TBM_BO_DEFAULT; + } + } else if (bufmgr->backend_module_data) { + flags = 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)"); _tbm_set_last_result(error); - bo->flags = TBM_BO_DEFAULT; + flags = TBM_BO_DEFAULT; } } else { - if (bo->bufmgr->backend->bo_get_flags) - bo->flags = bo->bufmgr->backend->bo_get_flags(bo); + if (bufmgr->backend->bo_get_flags) + flags = bufmgr->backend->bo_get_flags(bo); else - bo->flags = TBM_BO_DEFAULT; + flags = TBM_BO_DEFAULT; } + _tbm_bo_init(bufmgr, bo, flags); + 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_bufmgr_mutex_unlock(); return bo; + +import_fail: + free(bo); + _tbm_bufmgr_mutex_unlock(); + return NULL; } int @@ -942,7 +1158,13 @@ tbm_bo_size(tbm_bo bo) 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) { TBM_ERR("fail to get the size of the bo_data(%d).", error); @@ -1000,7 +1222,20 @@ tbm_bo_swap(tbm_bo bo1, tbm_bo bo2) 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); @@ -1238,7 +1473,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 { @@ -1246,9 +1489,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 */