tbm_module: add tbm_module_bo_map and use it

The tbm_module_bo_map calls it's backend function

Change-Id: I73cd41c9fe283a3e8d406a1a80d5468a494e98be

diff --git a/src/tbm_bo.c b/src/tbm_bo.c
index 2eb9213..4066567 100644 (file)
--- a/src/tbm_bo.c
+++ b/src/tbm_bo.c
@@ -408,35 +408,15 @@ tbm_bo_map(tbm_bo bo, int device, int opt)
                return (tbm_bo_handle) NULL;
        }
 
-       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);
-                       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_ERROR_INVALID_OPERATION);
-                       TBM_ERR("error: fail to map bo:%p\n", bo);
-                       goto bo_map_fail;
-                       /* LCOV_EXCL_STOP */
-               }
+       bo_handle = tbm_module_bo_map(bo->bufmgr->module, bo, bo->bo_data, device, opt, &error);
+       if (bo_handle.ptr == NULL) {
+               /* LCOV_EXCL_START */
+               TBM_ERR("error: fail to map bo:%p error:%d\n", bo, error);
+               _tbm_set_last_result(error);
+               _tbm_bo_unlock(bo);
+               _tbm_bufmgr_mutex_unlock();
+               return (tbm_bo_handle) NULL;
+               /* LCOV_EXCL_STOP */
        }
 
        /* increase the map_count */
@@ -447,11 +427,6 @@ 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

diff --git a/src/tbm_bufmgr_int.h b/src/tbm_bufmgr_int.h
index c77579f..28aa622 100644 (file)
--- a/src/tbm_bufmgr_int.h
+++ b/src/tbm_bufmgr_int.h
@@ -374,5 +374,6 @@ void          tbm_module_bo_free(tbm_module *module, tbm_bo bo, tbm_backend_bo_d
 int           tbm_module_bo_get_size(tbm_module *module, tbm_bo bo, tbm_backend_bo_data *bo_data, tbm_error_e *error);
 int           tbm_module_bo_get_memory_types(tbm_module *module, tbm_bo bo, tbm_backend_bo_data *bo_data, tbm_error_e *error);
 tbm_bo_handle tbm_module_bo_get_handle(tbm_module *module, tbm_bo bo, tbm_backend_bo_data *bo_data, int device, tbm_error_e *error);
+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);
 
 #endif /* _TBM_BUFMGR_INT_H_ */

diff --git a/src/tbm_module.c b/src/tbm_module.c
index 62e0441..d6663a9 100644 (file)
--- a/src/tbm_module.c
+++ b/src/tbm_module.c
@@ -977,4 +977,51 @@ tbm_module_bo_get_handle(tbm_module *module, tbm_bo bo, tbm_backend_bo_data *bo_
        }
 
        return bo_handle;
-}
\ No newline at end of file
+}
+
+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_backend_bo_func *bo_func = NULL;
+       tbm_bufmgr_backend backend = NULL;
+       tbm_bo_handle bo_handle;
+       hal_tbm_bo_handle hbo_handle;
+
+       TBM_RETURN_VAL_SET_ERR_IF_FAIL(module, (tbm_bo_handle)NULL, *error, TBM_ERROR_INVALID_PARAMETER);
+
+       switch (module->type) {
+       case TBM_MODULE_TYPE_HAL_TBM:
+               hbo_handle = hal_tbm_bo_map((hal_tbm_bo *)bo_data, device, opt, (hal_tbm_error *)error);
+               if (hbo_handle.ptr != NULL)
+                       memcpy(&bo_handle.ptr, &hbo_handle.ptr, sizeof(tbm_bo_handle));
+               break;
+/* LCOV_EXCL_START */
+       case TBM_MODULE_TYPE_TBM_BACKEND:
+               bo_func = module->bo_func;
+               TBM_RETURN_VAL_SET_ERR_IF_FAIL(bo_func, (tbm_bo_handle)NULL, *error, TBM_ERROR_INVALID_OPERATION);
+               TBM_RETURN_VAL_SET_ERR_IF_FAIL(bo_func->bo_map, (tbm_bo_handle)NULL, *error, TBM_ERROR_NOT_SUPPORTED);
+
+               bo_handle = bo_func->bo_map(bo_data, device, opt, error);
+               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_SET_ERR_IF_FAIL(backend, (tbm_bo_handle)NULL, *error, TBM_ERROR_INVALID_OPERATION);
+               TBM_RETURN_VAL_SET_ERR_IF_FAIL(backend->bo_map, (tbm_bo_handle)NULL, *error, TBM_ERROR_NOT_SUPPORTED);
+
+               bo_handle = backend->bo_map(bo, device, opt);
+               if (!bo_handle.ptr)
+                       *error = TBM_ERROR_INVALID_OPERATION;
+               else
+                       *error = TBM_ERROR_NONE;
+               break;
+       default:
+               TBM_ERR("Wrong module type:%d", module->type);
+               bo_handle.ptr = NULL;
+               *error = TBM_ERROR_INVALID_OPERATION;
+               break;
+/* LCOV_EXCL_STOP */
+       }
+
+       return bo_handle;
+}