tbm_bufmgr: lock/unlock tbm_bufmgr_mutex at tbm_bufmgr function
[platform/core/uifw/libtbm.git] / src / tbm_bo.c
index db05ef7..1987327 100644 (file)
@@ -34,8 +34,6 @@ 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)) {\
@@ -55,7 +53,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
        } \
 }
 
-static char *
+char *
 _tbm_flag_to_str(int f)
 {
        static char str[255];
@@ -88,18 +86,6 @@ _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 *
@@ -152,31 +138,23 @@ user_data_delete(tbm_user_data *user_data)
 static int
 _bo_lock(tbm_bo bo, int device, int opt)
 {
-       int ret = 1;
        tbm_error_e error;
+       int ret;
 
-       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_NONE) {
-                       TBM_WRN("fail to lock");
-                       _tbm_set_last_result(error);
+       error = tbm_bo_data_lock(bo->bo_data, device, opt);
+       _tbm_set_last_result(error);
+       switch(error) {
+               case TBM_ERROR_NONE:
+                       ret = 1;
+                       break;
+               case TBM_ERROR_NOT_SUPPORTED:
+                       ret = 1;
+                       _tbm_set_last_result(TBM_ERROR_NONE);
+                       break;
+               default:
                        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) {
-                       ret = bo->bufmgr->backend->bo_lock(bo, device, opt);
-                       if (!ret)
-                               _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION);
-               }
+                       TBM_WRN("fail to lock. error:%d", error);
+                       break;
        }
 
        return ret;
@@ -187,23 +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_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);
+       error = tbm_bo_data_unlock(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);
+                       break;
+               default:
+                       TBM_WRN("fail to lock. error:%d", error);
+                       break;
        }
 }
 
@@ -320,20 +292,6 @@ _tbm_bo_is_valid(tbm_bo bo)
 }
 
 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;
-
-       LIST_INITHEAD(&bo->user_data_list);
-
-       bufmgr->bo_cnt++;
-       LIST_ADD(&bo->item_link, &bufmgr->bo_list);
-}
-
-static void
 _tbm_bo_deinit(tbm_bo bo)
 {
        bo->magic = 0;
@@ -346,244 +304,17 @@ 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_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);
        if (!bo) {
                /* LCOV_EXCL_START */
-               _tbm_set_last_result(TBM_ERROR_OUT_OF_MEMORY);
-               _tbm_bufmgr_mutex_unlock();
+               TBM_ERR("tbm_bufmgr_internal_alloc_bo failed.");
                return NULL;
                /* LCOV_EXCL_STOP */
        }
 
-       _tbm_util_check_bo_cnt(bufmgr);
-
-       if (bufmgr->use_hal_tbm) {
-               bo_data = (tbm_backend_bo_data *)hal_tbm_bufmgr_alloc_bo(bufmgr->hal_bufmgr, size, flags, (hal_tbm_error *)&error);
-               /* LCOV_EXCL_START */
-               if (!bo_data) {
-                       _tbm_set_last_result(error);
-                       goto alloc_fail;
-               }
-               /* LCOV_EXCL_STOP */
-               bo->bo_data = bo_data;
-       } else 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_set_last_result(error);
-                       goto alloc_fail;
-                       /* LCOV_EXCL_STOP */
-               }
-               bo->bo_data = bo_data;
-       } else {
-               bo_priv = bufmgr->backend->bo_alloc(bo, size, flags);
-               if (!bo_priv) {
-                       /* LCOV_EXCL_START */
-                       
-                       _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION);
-                       goto alloc_fail;
-                       /* LCOV_EXCL_STOP */
-               }
-               bo->priv = bo_priv;
-       }
-
-       _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));
-
-       _tbm_bufmgr_mutex_unlock();
-
-       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, tbm_bo_memory_type flags, tbm_error_e *error)
-{
-       tbm_bo bo;
-       tbm_backend_bo_data *bo_data;
-
-       _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) {
-               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);
-               goto calloc_fail;
-       }
-
-       _tbm_util_check_bo_cnt(bufmgr);
-
-       /* LCOV_EXCL_START */
-       if (!bufmgr->use_hal_tbm) {
-               if (!bufmgr->backend_module_data || !bufmgr->bufmgr_func->bufmgr_alloc_bo_with_format) {
-                       
-                       TBM_ERR("error: not supported tbm_bo_alloc_with_format\n");
-                       _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED);
-                       goto bo_alloc_fail;
-               }
-       }
-       /* LCOV_EXCL_STOP */
-
-       if (bufmgr->use_hal_tbm) {
-               bo_data = (tbm_backend_bo_data *)hal_tbm_bufmgr_alloc_bo_with_format(bufmgr->hal_bufmgr,
-                                                               format, bo_idx, width, height, (hal_tbm_bo_memory_type)flags, (hal_tbm_error *)error);
-               if (!bo_data) {
-                       TBM_ERR("error: fail to tbm_bo_alloc_with_format\n");
-                       _tbm_set_last_result(*error);
-                       goto bo_alloc_fail;
-               }
-       } else {
-               bo_data = bufmgr->bufmgr_func->bufmgr_alloc_bo_with_format(bufmgr->bufmgr_data, format, bo_idx,
-                                                                                                                               width, height, flags, error);
-               if (!bo_data) {
-                       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(*error);
-                       goto bo_alloc_fail;
-               }
-       }
-
-       bo->bo_data = bo_data;
-       _tbm_bo_init(bufmgr, bo, flags);
-
-       _tbm_bufmgr_mutex_unlock();
-
-       return bo;
-
-bo_alloc_fail:
-       free(bo);
-calloc_fail:
-       _tbm_bufmgr_mutex_unlock();
-       return NULL;
-}
-
-tbm_bo
-tbm_bo_alloc_with_tiled_format(tbm_bufmgr bufmgr, int width, int height, int bpp, int format,
-                                                       tbm_bo_memory_type flags, int bo_idx, tbm_error_e *error)
-{
-       tbm_bo bo;
-       tbm_backend_bo_data *bo_data;
-
-       _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) {
-               TBM_ERR("error: fail to tbm_bo_alloc_with_tiled_format fmt(%s) idx(%d) w(%d) h(%d) flags(%s)\n",
-                               FOURCC_STR(format), bo_idx, width, height, _tbm_flag_to_str(flags));
-               _tbm_set_last_result(TBM_ERROR_OUT_OF_MEMORY);
-               _tbm_bufmgr_mutex_unlock();
-               return NULL;
-       }
-
-       _tbm_util_check_bo_cnt(bufmgr);
-
-       if (!bufmgr->use_hal_tbm) {
-               if (!bufmgr->backend_module_data || !bufmgr->bufmgr_func->bufmgr_alloc_bo_with_tiled_format) {
-                       TBM_ERR("error: not supported tbm_bo_alloc_with_tiled_format\n");
-                       _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED);
-                       free(bo);
-                       _tbm_bufmgr_mutex_unlock();
-                       return NULL;
-               }
-       }
-
-       if (bufmgr->use_hal_tbm)
-               bo_data = (tbm_backend_bo_data *)hal_tbm_bufmgr_alloc_bo_with_tiled_format(bufmgr->hal_bufmgr,
-                                                               width, height, bpp, format, (hal_tbm_bo_memory_type)flags, bo_idx, (hal_tbm_error *)error);
-       else
-               bo_data = bufmgr->bufmgr_func->bufmgr_alloc_bo_with_tiled_format(bufmgr->bufmgr_data, width, height,
-                                                                                                                                       bpp, format, flags, bo_idx, error);
-       if (!bo_data) {
-               TBM_ERR("error: fail to tbm_bo_alloc_with_tiled_format fmt(%s) idx(%d) w(%d) h(%d) flags(%s)\n",
-                               FOURCC_STR(format), bo_idx, width, height, _tbm_flag_to_str(flags));
-               _tbm_set_last_result(*error);
-               free(bo);
-               _tbm_bufmgr_mutex_unlock();
-               return NULL;
-       }
-
-       bo->bo_data = bo_data;
-       _tbm_bo_init(bufmgr, bo, flags);
-
-       _tbm_bufmgr_mutex_unlock();
-
-       return bo;
-}
-
-tbm_bo
-tbm_bo_alloc_with_surface(tbm_bufmgr bufmgr, int width, int height, int format, int flags, int bo_idx)
-{
-       tbm_bo bo;
-       void *bo_priv;
-
-       _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) {
-               TBM_ERR("error: fail to tbm_bo_alloc_with_surface fmt(%s) idx(%d) w(%d) h(%d) flags(%s)\n",
-                               FOURCC_STR(format), bo_idx, width, height, _tbm_flag_to_str(flags));
-               _tbm_set_last_result(TBM_ERROR_OUT_OF_MEMORY);
-               _tbm_bufmgr_mutex_unlock();
-               return NULL;
-       }
-
-       _tbm_util_check_bo_cnt(bufmgr);
-
-       if (!bufmgr->backend->surface_bo_alloc) {
-               TBM_ERR("error: not supported tbm_bo_alloc_with_surface\n");
-               _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED);
-               free(bo);
-               _tbm_bufmgr_mutex_unlock();
-               return NULL;
-       }
-
-       bo_priv = bufmgr->backend->surface_bo_alloc(bo, width, height, format, flags, bo_idx);
-       if (!bo_priv) {
-               TBM_ERR("error: fail to tbm_bo_alloc_with_surface fmt(%s) idx(%d) w(%d) h(%d) flags(%s)\n",
-                               FOURCC_STR(format), bo_idx, width, height, _tbm_flag_to_str(flags));
-               _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION);
-               free(bo);
-               _tbm_bufmgr_mutex_unlock();
-               return NULL;
-       }
-
-       bo->priv = bo_priv;
-       _tbm_bo_init(bufmgr, bo, flags);
-
-       _tbm_bufmgr_mutex_unlock();
-
        return bo;
 }
-/* LCOV_EXCL_STOP */
 
 tbm_bo
 tbm_bo_ref(tbm_bo bo)
@@ -641,35 +372,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_bo_data_map(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 */
@@ -680,17 +391,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
 tbm_bo_unmap(tbm_bo bo)
 {
-       int ret = 1;
        tbm_error_e error;
 
        _tbm_bufmgr_mutex_lock();
@@ -699,35 +404,14 @@ 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->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;
-                       goto done;
-                       /* LCOV_EXCL_STOP */
-               }
-       } else {
-               ret = bo->bufmgr->backend->bo_unmap(bo);
-               if (!ret) {
-                       /* LCOV_EXCL_START */
-                       TBM_ERR("error: bo(%p) map_cnt(%d)\n", bo, bo->map_cnt);
-                       _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION);
-                       goto done;
-                       /* LCOV_EXCL_STOP */
-               }
+       error = tbm_bo_data_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);
+               _tbm_bufmgr_mutex_unlock();
+               return 0;
+               /* LCOV_EXCL_STOP */
        }
 
        /* decrease the map_count */
@@ -737,10 +421,9 @@ tbm_bo_unmap(tbm_bo bo)
 
        _tbm_bo_unlock(bo);
 
-done:
        _tbm_bufmgr_mutex_unlock();
 
-       return ret;
+       return 1;
 }
 
 tbm_bo_handle
@@ -754,35 +437,14 @@ 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->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);
-                       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_ERR("error: bo(%p) bo_handle(%p)\n", bo, bo_handle.ptr);
-                       _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION);
-                       goto bo_handle_fail;
-                       /* LCOV_EXCL_STOP */
-               }
+       bo_handle = tbm_bo_data_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;
+               /* LCOV_EXCL_STOP */
        }
 
        TBM_TRACE_BO("bo(%p) bo_handle(%p)\n", bo, bo_handle.ptr);
@@ -790,10 +452,6 @@ 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
@@ -807,54 +465,18 @@ tbm_bo_export(tbm_bo bo)
 
        TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0);
 
-       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();
-                       _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED);
-                       return 0;
-                       /* LCOV_EXCL_STOP */
-               }
-
-               ret = bo->bufmgr->bo_func->bo_export_key(bo->bo_data, &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->bo_export) {
-                       /* LCOV_EXCL_START */
-                       _tbm_bufmgr_mutex_unlock();
-                       _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED);
-                       return 0;
-                       /* LCOV_EXCL_STOP */
-               }
-
-               ret = bo->bufmgr->backend->bo_export(bo);
-               if (!ret) {
-                       /* LCOV_EXCL_START */
-                       TBM_ERR("error: bo(%p) tbm_key(%d)\n", bo, ret);
-                       _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION);
-                       goto done;
-                       /* LCOV_EXCL_STOP */
-               }
+       ret = tbm_bo_data_export_key(bo->bo_data, &error);
+       if (!ret) {
+               /* LCOV_EXCL_START */
+               TBM_ERR("tbm_moule_bo_export_key failed. bo:%p tbm_key:%d error:%d", bo, ret, error);
+               _tbm_set_last_result(error);
+               _tbm_bufmgr_mutex_unlock();
+               return ret;
+               /* LCOV_EXCL_STOP */
        }
 
-       TBM_TRACE_BO("bo(%p) tbm_key(%u)\n", bo, ret);
+       TBM_TRACE_BO("bo:%p tbm_key:%u", bo, ret);
 
-done:
        _tbm_bufmgr_mutex_unlock();
 
        return ret;
@@ -863,7 +485,7 @@ done:
 tbm_fd
 tbm_bo_export_fd(tbm_bo bo)
 {
-       tbm_fd ret;
+       tbm_fd fd;
        tbm_error_e error;
 
        _tbm_bufmgr_mutex_lock();
@@ -871,367 +493,53 @@ tbm_bo_export_fd(tbm_bo bo)
 
        TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), -1);
 
-       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();
-                       _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED);
-                       return -1;
-                       /* LCOV_EXCL_STOP */
-               }
-
-               ret = bo->bufmgr->bo_func->bo_export_fd(bo->bo_data, &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->bo_export_fd) {
-                       /* LCOV_EXCL_START */
-                       _tbm_bufmgr_mutex_unlock();
-                       _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED);
-                       return -1;
-                       /* LCOV_EXCL_STOP */
-               }
-
-               ret = bo->bufmgr->backend->bo_export_fd(bo);
-               if (ret < 0) {
-                       /* LCOV_EXCL_START */
-                       TBM_ERR("error: bo(%p) tbm_fd(%d)\n", bo, ret);
-                       _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION);
-                       goto done;
-                       /* LCOV_EXCL_STOP */
-               }
+       fd = tbm_bo_data_export_fd(bo->bo_data, &error);
+       if (fd < 0) {
+               /* LCOV_EXCL_START */
+               TBM_ERR("tbm_bo_data_export_fd filed. bo:%p tbm_fd:%d error:%d", bo, fd, error);
+               _tbm_set_last_result(error);
+               _tbm_bufmgr_mutex_unlock();
+               return fd;
+               /* LCOV_EXCL_STOP */
        }
 
-       TBM_TRACE_BO("bo(%p) tbm_fd(%d)\n", bo, ret);
+       TBM_TRACE_BO("bo:%p tbm_fd:%d", bo, fd);
 
-done:
        _tbm_bufmgr_mutex_unlock();
 
-       return ret;
+       return fd;
 }
 
 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;
-       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->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 */
-                       }
-               }
-       }
 
-       _tbm_util_check_bo_cnt(bufmgr);
-
-       bo = calloc(1, sizeof(struct _tbm_bo));
+       bo = tbm_bufmgr_internal_import_bo_with_key(bufmgr, key);
        if (!bo) {
                /* LCOV_EXCL_START */
-               TBM_ERR("error: fail to import of tbm_bo by key(%d)\n", key);
-               _tbm_set_last_result(TBM_ERROR_OUT_OF_MEMORY);
-               _tbm_bufmgr_mutex_unlock();
+               TBM_ERR("tbm_bufmgr_internal_import_bo_with_key failed");
                return NULL;
                /* LCOV_EXCL_STOP */
        }
 
-       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);
-                       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 {
-               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);
-                       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->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_bufmgr_mutex_unlock();
-                                       return bo2;
-                               }
-                       }
-               }
-               bo->priv = bo_priv;
-       }
-
-       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);
-                       flags = TBM_BO_DEFAULT;
-               }
-       } else {
-               if (bufmgr->backend->bo_get_flags)
-                       flags = bufmgr->backend->bo_get_flags(bo);
-               else
-                       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));
-
-       _tbm_bufmgr_mutex_unlock();
-
        return bo;
-
-import_fail:
-       free(bo);
-       _tbm_bufmgr_mutex_unlock();
-       return NULL;
 }
 
 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;
-       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->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 */
-                       }
-               }
-       }
-
-       _tbm_util_check_bo_cnt(bufmgr);
-
-       bo = calloc(1, sizeof(struct _tbm_bo));
+       bo = tbm_bufmgr_internal_import_bo_with_fd(bufmgr, fd);
        if (!bo) {
                /* LCOV_EXCL_START */
-               TBM_ERR("error: fail to import tbm_bo by tbm_fd(%d)\n", fd);
-               _tbm_set_last_result(TBM_ERROR_OUT_OF_MEMORY);
-               _tbm_bufmgr_mutex_unlock();
+               TBM_ERR("tbm_bufmgr_internal_import_fd failed.");
                return NULL;
                /* LCOV_EXCL_STOP */
        }
 
-       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 (!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);
-                       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) 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 {
-               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);
-                       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->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_bufmgr_mutex_unlock();
-                                       return bo2;
-                               }
-                       }
-               }
-               bo->priv = bo_priv;
-       }
-
-       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);
-                       flags = TBM_BO_DEFAULT;
-               }
-       } else {
-               if (bufmgr->backend->bo_get_flags)
-                       flags = bufmgr->backend->bo_get_flags(bo);
-               else
-                       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));
-
-       _tbm_bufmgr_mutex_unlock();
-
        return bo;
-
-import_fail:
-       free(bo);
-       _tbm_bufmgr_mutex_unlock();
-       return NULL;
 }
 
 int
@@ -1245,20 +553,8 @@ tbm_bo_size(tbm_bo bo)
 
        TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0);
 
-       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);
-                       _tbm_set_last_result(TBM_ERROR_NONE);
-               }
-       } else
-               size = bo->bufmgr->backend->bo_size(bo);
+       size = tbm_bo_data_get_size(bo->bo_data, &error);
+       _tbm_set_last_result(error);
 
        TBM_TRACE_BO("bo(%p) size(%d)\n", bo, size);
 
@@ -1309,36 +605,10 @@ tbm_bo_swap(tbm_bo bo1, tbm_bo bo2)
 
        TBM_TRACE_BO("before: bo1(%p) bo2(%p)\n", bo1, bo2);
 
-       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 {
-               size1 = bo1->bufmgr->backend->bo_size(bo1);
-               size2 = bo2->bufmgr->backend->bo_size(bo2);
-       }
+       size1 = tbm_bo_data_get_size(bo1->bo_data, &error1);
+       _tbm_set_last_result(error1);
+       size2 = tbm_bo_data_get_size(bo2->bo_data, &error2);
+       _tbm_set_last_result(error2);
 
        if (size1 != size2) {
                TBM_ERR("error: bo1 size(%d) and bo2 size(%d) is different.", size1, size2);
@@ -1346,11 +616,11 @@ tbm_bo_swap(tbm_bo bo1, tbm_bo bo2)
                goto fail;
        }
 
-       TBM_TRACE_BO("after: bo1(%p) bo2(%p)\n", bo1, bo2);
+       temp = bo1->bo_data;
+       bo1->bo_data = bo2->bo_data;
+       bo2->bo_data = temp;
 
-       temp = bo1->priv;
-       bo1->priv = bo2->priv;
-       bo2->priv = temp;
+       TBM_TRACE_BO("after: bo1(%p) bo2(%p)\n", bo1, bo2);
 
        _tbm_bufmgr_mutex_unlock();
 
@@ -1546,11 +816,12 @@ _tbm_bo_free(tbm_bo bo)
        if (!LIST_IS_EMPTY(&bo->user_data_list)) {
                tbm_user_data *old_data = NULL, *tmp;
 
-               LIST_FOR_EACH_ENTRY_SAFE(old_data, tmp,
-                               &bo->user_data_list, item_link) {
+               LIST_FOR_EACH_ENTRY_SAFE(old_data, tmp, &bo->user_data_list, item_link) {
                        TBM_DBG("free user_data\n");
                        user_data_delete(old_data);
                }
+
+               LIST_INITHEAD(&bo->user_data_list); // TODO: remove this. build-break when it is removed.
        }
 
        while (bo->lock_cnt > 0) {
@@ -1559,17 +830,7 @@ _tbm_bo_free(tbm_bo bo)
                bo->lock_cnt--;
        }
 
-       /* call the bo_free */
-       if (bo->bufmgr->use_hal_tbm) {
-               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 {
-               bo->bufmgr->backend->bo_free(bo);
-               bo->priv = NULL;
-       }
+       tbm_bo_data_free(bo->bo_data, bo->get_from_surface_data);
 
        _tbm_bo_deinit(bo);