From 8c3403e9836139598d8e3248d93e181dc424fb3f Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Thu, 17 Jun 2021 18:59:14 +0900 Subject: [PATCH] tbm_module: add tbm_module_bo_unlock and use it The tbm_module_bo_unlock calls it's backend function Change-Id: Ic9b5f241223780dd39bed1c508a58140245c09d0 --- src/tbm_bo.c | 30 ++++++++++-------------------- src/tbm_bufmgr_int.h | 1 + src/tbm_module.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 20 deletions(-) diff --git a/src/tbm_bo.c b/src/tbm_bo.c index d837067..c97ac1d 100644 --- a/src/tbm_bo.c +++ b/src/tbm_bo.c @@ -165,27 +165,17 @@ _bo_unlock(tbm_bo bo) { tbm_error_e error; - 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) { + error = tbm_module_bo_unlock(bo->bufmgr->module, bo, bo->bo_data); + _tbm_set_last_result(error); + switch(error) { + case TBM_ERROR_NONE: + break; + case 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) { - TBM_WRN("fail to unlock"); - _tbm_set_last_result(error); - } - } - } else { - if (bo->bufmgr->backend->bo_unlock) - bo->bufmgr->backend->bo_unlock(bo); + break; + default: + TBM_WRN("fail to lock. error:%d", error); + break; } } diff --git a/src/tbm_bufmgr_int.h b/src/tbm_bufmgr_int.h index bde820e..c51ab88 100644 --- a/src/tbm_bufmgr_int.h +++ b/src/tbm_bufmgr_int.h @@ -377,5 +377,6 @@ tbm_bo_handle tbm_module_bo_get_handle(tbm_module *module, tbm_bo bo, tbm_backen tbm_bo_handle tbm_module_bo_map(tbm_module *module, tbm_bo bo, tbm_backend_bo_data *bo_data, int device, int opt, tbm_error_e *error); tbm_error_e tbm_module_bo_unmap(tbm_module *module, tbm_bo bo, tbm_backend_bo_data *bo_data); tbm_error_e tbm_module_bo_lock(tbm_module *module, tbm_bo bo, tbm_backend_bo_data *bo_data, int device, int opt); +tbm_error_e tbm_module_bo_unlock(tbm_module *module, tbm_bo bo, tbm_backend_bo_data *bo_data); #endif /* _TBM_BUFMGR_INT_H_ */ diff --git a/src/tbm_module.c b/src/tbm_module.c index 84e6063..58a44e4 100644 --- a/src/tbm_module.c +++ b/src/tbm_module.c @@ -1115,3 +1115,45 @@ tbm_module_bo_lock(tbm_module *module, tbm_bo bo, tbm_backend_bo_data *bo_data, return error; } + +tbm_error_e +tbm_module_bo_unlock(tbm_module *module, tbm_bo bo, tbm_backend_bo_data *bo_data) +{ + tbm_backend_bo_func *bo_func = NULL; + tbm_bufmgr_backend backend = NULL; + tbm_error_e error; + + TBM_RETURN_VAL_IF_FAIL(module, TBM_ERROR_INVALID_PARAMETER); + + switch (module->type) { + case TBM_MODULE_TYPE_HAL_TBM: + error = (tbm_error_e)hal_tbm_bo_unlock((hal_tbm_bo *)bo_data); + break; +/* LCOV_EXCL_START */ + case TBM_MODULE_TYPE_TBM_BACKEND: + bo_func = module->bo_func; + TBM_RETURN_VAL_IF_FAIL(bo_func, TBM_ERROR_INVALID_OPERATION); + if (!bo_func->bo_unlock) + return TBM_ERROR_NOT_SUPPORTED; + + error = bo_func->bo_unlock(bo->bo_data); + break; + case TBM_MODULE_TYPE_BUFMGR_BACKEND: + TBM_WRN("!!WARNING: This backend interface will be DEPRECATED after Tizen 6.5."); + backend = module->backend; + TBM_RETURN_VAL_IF_FAIL(backend, TBM_ERROR_INVALID_OPERATION); + if (!backend->bo_unlock) + return TBM_ERROR_NOT_SUPPORTED; + + backend->bo_unlock(bo); + error = TBM_ERROR_NONE; + break; + default: + TBM_ERR("Wrong module type:%d", module->type); + error = TBM_ERROR_INVALID_OPERATION; + break; +/* LCOV_EXCL_STOP */ + } + + return error; +} -- 2.7.4