From a6e9f8dc1ea300c3c473938de6d6e7e796b36783 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Thu, 10 Jun 2021 11:04:13 +0900 Subject: [PATCH] tbm_bufmgr: use tbm_module_load/unload functions Use tbm_module_load/unload functions and remove the useless codes. Change-Id: I1f239b514632a639c20874c1bdd4db2a397a9b4d --- src/tbm_bufmgr.c | 418 +-------------------------------------------------- src/tbm_bufmgr_int.h | 6 +- src/tbm_module.c | 2 +- 3 files changed, 9 insertions(+), 417 deletions(-) diff --git a/src/tbm_bufmgr.c b/src/tbm_bufmgr.c index 8182ccf..4f6ece3 100644 --- a/src/tbm_bufmgr.c +++ b/src/tbm_bufmgr.c @@ -55,22 +55,6 @@ void _tbm_bufmgr_mutex_unlock(void); //#define TBM_BUFMGR_INIT_TIME -#define PREFIX_LIB "libtbm_" -#define SUFFIX_LIB ".so" -#define DEFAULT_LIB PREFIX_LIB"default"SUFFIX_LIB - -/* values to indicate unspecified fields in XF86ModReqInfo. */ -#define MAJOR_UNSPEC 0xFF -#define MINOR_UNSPEC 0xFF -#define PATCH_UNSPEC 0xFFFF -#define ABI_VERS_UNSPEC 0xFFFFFFFF - -#define MODULE_VERSION_NUMERIC(maj, min, patch) \ - ((((maj) & 0xFF) << 24) | (((min) & 0xFF) << 16) | (patch & 0xFFFF)) -#define GET_MODULE_MAJOR_VERSION(vers) (((vers) >> 24) & 0xFF) -#define GET_MODULE_MINOR_VERSION(vers) (((vers) >> 16) & 0xFF) -#define GET_MODULE_PATCHLEVEL(vers) ((vers) & 0xFFFF) - #define MAX_SIZE_N(dest) (sizeof(dest) - strlen(dest) - 1) /* check condition */ @@ -185,375 +169,6 @@ _tbm_util_get_appname_from_pid(long pid, char *str) snprintf(str, sizeof(cmdline), "%s", cmdline); } -static int -_tbm_backend_load_hal_tbm(tbm_bufmgr bufmgr) -{ - hal_tbm_backend *hal_backend = NULL; - hal_tbm_bufmgr_capability capability; - hal_tbm_bufmgr *hal_bufmgr; - hal_tbm_error ret = HAL_TBM_ERROR_NONE; - hal_tbm_fd auth_drm_fd = -1; - - hal_backend = hal_tbm_get_backend(&ret); - if (hal_backend == NULL || ret != HAL_TBM_ERROR_NONE) { - TBM_ERR("get backend fail"); - return 0; - } - - hal_bufmgr = hal_tbm_backend_get_bufmgr(hal_backend, &ret); - if (hal_bufmgr == NULL || ret != HAL_TBM_ERROR_NONE) { - TBM_ERR("get hal_bufmgr fail"); - goto get_backend_fail; - } - - if (hal_tbm_backend_has_drm_device(hal_backend, &ret)) { - auth_drm_fd = hal_tbm_backend_get_master_drm_fd(hal_backend, &ret); - if (auth_drm_fd < 0) { - TBM_INFO("tbm_backend has no master drm_fd."); - - auth_drm_fd = tbm_drm_helper_get_master_fd(); - if (auth_drm_fd < 0) { - TBM_INFO("libtbm requests an authenticated drm_fd to a process(display server)."); - if (!tbm_drm_helper_get_auth_info(&auth_drm_fd, NULL, NULL)) { - TBM_ERR("get auth drm_fd fail"); - goto get_backend_fail; - } - } else { - TBM_INFO("libtbm gets a master drm_fd from libtdm via tbm_drm_helper."); - } - - TBM_INFO("libtbm sends a master drm_fd as an authentiated drm_fd to tbm_backend."); - ret = hal_tbm_backend_set_authenticated_drm_fd(hal_backend, auth_drm_fd); - if (ret != HAL_TBM_ERROR_NONE) { - TBM_ERR("hal_tbm_backend_set_authenticated_drm_fd failed."); - goto get_backend_fail; - } - } else { - TBM_INFO("tbm_backend has a master drm_fd."); - - tbm_drm_helper_set_tbm_master_fd(auth_drm_fd); - } - tbm_drm_helper_set_fd(auth_drm_fd); - } - - capability = hal_tbm_bufmgr_get_capabilities(hal_bufmgr, &ret); - if (ret != HAL_TBM_ERROR_NONE) { - TBM_ERR("hal_tbm_bufmgr_get_capabilities fail."); - goto get_backend_fail; - } - - if (capability == HAL_TBM_BUFMGR_CAPABILITY_NONE) { - TBM_ERR("The capabilities of the backend module is TBM_BUFMGR_CAPABILITY_NONE."); - TBM_ERR("TBM_BUFMGR_CAPABILITY_SHARE_FD is the essential capability."); - goto get_backend_fail; - } - if (!(capability & HAL_TBM_BUFMGR_CAPABILITY_SHARE_FD)) { - TBM_ERR("The capabilities of the backend module had no TBM_BUFMGR_CAPABILITY_SHARE_FD."); - TBM_ERR("The tbm backend has to get TBM_BUFMGR_CAPABILITY_SHARE_FD. "); - goto get_backend_fail; - } - bufmgr->capabilities = capability; - - bufmgr->hal_backend = hal_backend; - bufmgr->hal_bufmgr = hal_bufmgr; - - bufmgr->use_hal_tbm = 1; - - TBM_INFO("use HAL-TBM_API"); - - return 1; - -get_backend_fail: - if (auth_drm_fd >= 0) - close(auth_drm_fd); - hal_tbm_put_backend(hal_backend); - return 0; -} - -static int -_check_version(TBMModuleVersionInfo *data) -{ - int backend_module_major, backend_module_minor; - int tbm_backend_major, tbm_backend_minor; - - backend_module_major = GET_ABI_MAJOR(data->abiversion); - backend_module_minor = GET_ABI_MINOR(data->abiversion); - - TBM_DBG("TBM module %s: vendor=\"%s\" ABI=%d,%d\n", - data->modname ? data->modname : "UNKNOWN!", - data->vendor ? data->vendor : "UNKNOWN!", backend_module_major, backend_module_minor); - - tbm_backend_major = GET_ABI_MAJOR(TBM_ABI_VERSION); - tbm_backend_minor = GET_ABI_MINOR(TBM_ABI_VERSION); - - TBM_DBG("TBM ABI version %d.%d\n", - tbm_backend_major, tbm_backend_minor); - - if (backend_module_major != tbm_backend_major) { - TBM_ERR("TBM module ABI major ver(%d) doesn't match the TBM's ver(%d)\n", - backend_module_major, tbm_backend_major); - return 0; - } else if (backend_module_minor > tbm_backend_minor) { - TBM_ERR("TBM module ABI minor ver(%d) is newer than the TBM's ver(%d)\n", - backend_module_minor, tbm_backend_minor); - return 0; - } - - return 1; -} - -static int -_tbm_backend_check_bufmgr_func(tbm_backend_bufmgr_func *bufmgr_func) -{ - TBM_RETURN_VAL_IF_FAIL(bufmgr_func, 0); /* mandatory symbol */ - TBM_RETURN_VAL_IF_FAIL(bufmgr_func->bufmgr_get_capabilities, 0); /* mandatory symbol */ - TBM_RETURN_VAL_IF_FAIL(bufmgr_func->bufmgr_bind_native_display, 0); /* mandatory symbol */ - TBM_RETURN_VAL_IF_FAIL(bufmgr_func->bufmgr_get_supported_formats, 0); /* mandatory symbol */ - TBM_RETURN_VAL_IF_FAIL(bufmgr_func->bufmgr_get_plane_data, 0); /* mandatory symbol */ - TBM_RETURN_VAL_IF_FAIL(bufmgr_func->bufmgr_alloc_bo, 0); /* mandatory symbol */ - if (!bufmgr_func->bufmgr_alloc_bo_with_format) - TBM_DBG("No bufmgr_func->bufmgr_alloc_bo_with_format."); - TBM_RETURN_VAL_IF_FAIL(bufmgr_func->bufmgr_import_fd, 0); /* mandatory symbol */ - if (!bufmgr_func->bufmgr_import_key) - TBM_DBG("No bufmgr_func->bo_export_key."); - - return 1; -} - -static int -_tbm_backend_check_bufmgr_bo(tbm_backend_bo_func *bo_func) -{ - TBM_RETURN_VAL_IF_FAIL(bo_func, 0); /* mandatory symbol */ - TBM_RETURN_VAL_IF_FAIL(bo_func->bo_free, 0); /* mandatory symbol */ - TBM_RETURN_VAL_IF_FAIL(bo_func->bo_get_size, 0); /* mandatory symbol */ - TBM_RETURN_VAL_IF_FAIL(bo_func->bo_get_memory_types, 0); /* mandatory symbol */ - TBM_RETURN_VAL_IF_FAIL(bo_func->bo_get_handle, 0); /* mandatory symbol */ - TBM_RETURN_VAL_IF_FAIL(bo_func->bo_map, 0); /* mandatory symbol */ - TBM_RETURN_VAL_IF_FAIL(bo_func->bo_unmap, 0); /* mandatory symbol */ - if (!bo_func->bo_lock) - TBM_DBG("No bo_func->bo_lock."); - if (!bo_func->bo_unlock) - TBM_DBG("No bo_func->bo_unlock."); - TBM_RETURN_VAL_IF_FAIL(bo_func->bo_export_fd, 0); /* mandatory symbol */ - if (!bo_func->bo_export_key) - TBM_INFO("No bo_func->bo_export_key."); - - return 1; -} - -static int -_tbm_backend_load_module(tbm_bufmgr bufmgr, const char *file) -{ - char path[PATH_MAX] = {0, }; - void *module_data = NULL; - tbm_backend_module *backend_module_data = NULL; - tbm_backend_bufmgr_data *bufmgr_data = NULL; - int backend_module_major, backend_module_minor; - int tbm_backend_major, tbm_backend_minor; - tbm_error_e error; - - snprintf(path, sizeof(path), BUFMGR_MODULE_DIR "/%s", file); - - module_data = dlopen(path, RTLD_LAZY); - if (!module_data) { - TBM_ERR("failed to load module: %s(%s)\n", dlerror(), file); - return 0; - } - - backend_module_data = dlsym(module_data, "tbm_backend_module_data"); - if (!backend_module_data) { - TBM_ERR("Error: module does not have data object.\n"); - goto err; - } - - tbm_backend_major = GET_ABI_MAJOR(TBM_BACKEND_ABI_LATEST_VERSION); - tbm_backend_minor = GET_ABI_MINOR(TBM_BACKEND_ABI_LATEST_VERSION); - TBM_INFO("TBM Backend ABI version %d.%d\n", tbm_backend_major, tbm_backend_minor); - - backend_module_major = GET_ABI_MAJOR(backend_module_data->abi_version); - backend_module_minor = GET_ABI_MINOR(backend_module_data->abi_version); - - TBM_INFO("TBM module %s: vendor=\"%s\" Backend ABI version=%d.%d\n", - backend_module_data->name ? backend_module_data->name : "UNKNOWN!", - backend_module_data->vendor ? backend_module_data->vendor : "UNKNOWN!", - backend_module_major, backend_module_minor); - - if (backend_module_major > tbm_backend_major) { - TBM_ERR("TBM module ABI major ver(%d) is newer than the TBM's ver(%d)\n", - backend_module_major, tbm_backend_major); - goto err; - } else if (backend_module_minor > tbm_backend_minor) { - TBM_ERR("TBM module ABI minor ver(%d) is newer than the TBM's ver(%d)\n", - backend_module_minor, tbm_backend_minor); - goto err; - } - - if (!backend_module_data->init) { - TBM_ERR("Error: module does not supply init symbol.\n"); - goto err; - } - - if (!backend_module_data->deinit) { - TBM_ERR("Error: module does not supply deinit symbol.\n"); - goto err; - } - - bufmgr_data = backend_module_data->init(bufmgr, &error); - if (!bufmgr_data) { - TBM_ERR("Fail to init module(%s)\n", file); - goto err; - } - - /* check the mandatory symbols of the backend module */ - if (!_tbm_backend_check_bufmgr_func(bufmgr->bufmgr_func)) { - TBM_ERR("Fail to check the bufmgr_func symboles."); - goto err; - } - - if (!_tbm_backend_check_bufmgr_bo(bufmgr->bo_func)) { - TBM_ERR("Fail to check the bufmgr_bo symboles."); - goto err; - } - - /* get the capability */ - bufmgr->capabilities = bufmgr->bufmgr_func->bufmgr_get_capabilities(bufmgr_data, &error); - if (bufmgr->capabilities == TBM_BUFMGR_CAPABILITY_NONE) { - TBM_ERR("The capabilities of the backend module is TBM_BUFMGR_CAPABILITY_NONE."); - TBM_ERR("TBM_BUFMGR_CAPABILITY_SHARE_FD is the essential capability."); - goto err; - } - - if (!(bufmgr->capabilities & TBM_BUFMGR_CAPABILITY_SHARE_FD)) { - TBM_ERR("The capabilities of the backend module had no TBM_BUFMGR_CAPABILITY_SHARE_FD."); - TBM_ERR("The tbm backend has to get TBM_BUFMGR_CAPABILITY_SHARE_FD. "); - goto err; - } - - bufmgr->module_data = module_data; - bufmgr->backend_module_data = backend_module_data; - bufmgr->bufmgr_data = bufmgr_data; - - TBM_INFO("Success to load module(%s)\n", file); - - return 1; - -err: - if (bufmgr_data) - bufmgr->backend_module_data->deinit(bufmgr_data); - if (module_data) - dlclose(module_data); - - return 0; -} - -static int -_tbm_bufmgr_load_module(tbm_bufmgr bufmgr, int fd, const char *file) -{ - char path[PATH_MAX] = {0, }; - TBMModuleVersionInfo *vers; - TBMModuleData *initdata; - ModuleInitProc init; - void *module_data; - - snprintf(path, sizeof(path), BUFMGR_MODULE_DIR "/%s", file); - - module_data = dlopen(path, RTLD_LAZY); - if (!module_data) { - TBM_ERR("failed to load module: %s(%s)\n", dlerror(), file); - return 0; - } - - initdata = dlsym(module_data, "tbmModuleData"); - if (!initdata) { - TBM_ERR("Error: module does not have data object.\n"); - goto err; - } - - vers = initdata->vers; - if (!vers) { - TBM_ERR("Error: module does not supply version information.\n"); - goto err; - } - - init = initdata->init; - if (!init) { - TBM_ERR("Error: module does not supply init symbol.\n"); - goto err; - } - - if (!_check_version(vers)) { - TBM_ERR("Fail to check version.\n"); - goto err; - } - - if (!init(bufmgr, fd)) { - TBM_ERR("Fail to init module(%s)\n", file); - goto err; - } - - if (!bufmgr->backend || !bufmgr->backend->priv) { - TBM_ERR("Error: module(%s) wrong operation. Check backend or backend's priv.\n", file); - goto err; - } - - bufmgr->module_data = module_data; - - TBM_DBG("Success to load module(%s)\n", file); - - return 1; - -err: - dlclose(module_data); - return 0; -} - -static int -_tbm_load_module(tbm_bufmgr bufmgr, int fd) -{ - struct dirent **namelist; - int ret = 0, n; - - /* try to load the hal-tbm backend module */ - ret = _tbm_backend_load_hal_tbm(bufmgr); - if (ret) - return 1; - - /* try to load the new backend module */ - ret = _tbm_backend_load_module(bufmgr, DEFAULT_LIB); - if (ret) - return 1; - - /* try to load the old(deprecated) backend mdoule */ - ret = _tbm_bufmgr_load_module(bufmgr, fd, DEFAULT_LIB); - if (ret) - return 1; - - /* load bufmgr priv from configured path */ - n = scandir(BUFMGR_MODULE_DIR, &namelist, 0, alphasort); - if (n < 0) { - TBM_ERR("no files : %s\n", BUFMGR_MODULE_DIR); - return 0; - } - - while (n--) { - if (!ret && strstr(namelist[n]->d_name, PREFIX_LIB)) { - const char *p = strstr(namelist[n]->d_name, SUFFIX_LIB); - - if (p && !strcmp(p, SUFFIX_LIB)) { - ret = _tbm_backend_load_module(bufmgr, namelist[n]->d_name); - if (!ret) - ret = _tbm_bufmgr_load_module(bufmgr, fd, - namelist[n]->d_name); - } - } - - free(namelist[n]); - } - - free(namelist); - - return ret; -} /* LCOV_EXCL_STOP */ static tbm_bufmgr @@ -619,7 +234,8 @@ _tbm_bufmgr_init(int fd, int server) } /* load bufmgr priv from env */ - if (!_tbm_load_module(gBufMgr, gBufMgr->fd)) { + gBufMgr->module = tbm_module_load(gBufMgr, gBufMgr->fd); + if (!gBufMgr->module) { TBM_ERR("error : Fail to load bufmgr backend\n"); _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION); free(gBufMgr); @@ -727,36 +343,8 @@ tbm_bufmgr_deinit(tbm_bufmgr bufmgr) LIST_DELINIT(&bufmgr->surf_list); } - if (bufmgr->use_hal_tbm) { - if (bufmgr->auth_wl_socket_created) { - tbm_drm_helper_wl_auth_server_deinit(); - close(bufmgr->auth_fd); - tbm_drm_helper_unset_tbm_master_fd(); - } - tbm_drm_helper_unset_fd(); - - hal_tbm_put_backend(bufmgr->hal_backend); - bufmgr->hal_backend = NULL; - bufmgr->hal_bufmgr = NULL; - bufmgr->use_hal_tbm = 0; - } else { - if (bufmgr->backend_module_data) { - /* deinit and backend destroys the backend func and data */ - bufmgr->backend_module_data->deinit(bufmgr->bufmgr_data); - bufmgr->bo_func = NULL; - bufmgr->bufmgr_func = NULL; - bufmgr->bufmgr_data = NULL; - bufmgr->backend_module_data = NULL; - } else { - /* destroy bufmgr priv */ - bufmgr->backend->bufmgr_deinit(bufmgr->backend->priv); - bufmgr->backend->priv = NULL; - tbm_backend_free(bufmgr->backend); - bufmgr->backend = NULL; - } + tbm_module_unload(bufmgr->module); - dlclose(bufmgr->module_data); - } if (bufmgr->fd > 0) close(bufmgr->fd); diff --git a/src/tbm_bufmgr_int.h b/src/tbm_bufmgr_int.h index ce6342f..b19351b 100644 --- a/src/tbm_bufmgr_int.h +++ b/src/tbm_bufmgr_int.h @@ -354,4 +354,8 @@ tbm_bo tbm_bo_alloc_with_tiled_format(tbm_bufmgr bufmgr, int width, int height, tbm_bo tbm_bo_alloc_with_surface(tbm_bufmgr bufmgr, int width, int height, int format, int flags, int bo_idx); tbm_bo tbm_bo_alloc_with_bo_data(tbm_bufmgr bufmgr, tbm_backend_bo_data *bo_data, int flags); -#endif /* _TBM_BUFMGR_INT_H_ */ +/* tbm_module functions */ +tbm_module *tbm_module_load(tbm_bufmgr bufmgr, int fd); +void tbm_module_unload(tbm_module *module); + +#endif /* _TBM_BUFMGR_INT_H_ */ diff --git a/src/tbm_module.c b/src/tbm_module.c index 893f4a4..8031385 100644 --- a/src/tbm_module.c +++ b/src/tbm_module.c @@ -51,7 +51,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define GET_MODULE_MINOR_VERSION(vers) (((vers) >> 16) & 0xFF) #define GET_MODULE_PATCHLEVEL(vers) ((vers) & 0xFFFF) -#define MAX_SIZE_N(dest) (sizeof(dest) - strlen(dest) - 1) +/* LCOV_EXCL_START */ static int _tbm_backend_load_hal_tbm(tbm_bufmgr bufmgr) -- 2.7.4