X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Ftbm_bo.c;h=19873276600ad18c8e7d86054baca6c9580eee27;hb=53d34ee207b956e9bae7c4b432f2976a10ce7b81;hp=2eb9213d146fb7eaeedd98fad50e953a9117ae1f;hpb=5a171d78ef661ed45c49b65ec8b2975393aba747;p=platform%2Fcore%2Fuifw%2Flibtbm.git

diff --git a/src/tbm_bo.c b/src/tbm_bo.c
index 2eb9213..1987327 100644
--- a/src/tbm_bo.c
+++ b/src/tbm_bo.c
@@ -138,35 +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_NOT_SUPPORTED) {
+	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);
-		} 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) {
-				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);
-		}
+			break;
+		default:
+			ret = 0;
+			TBM_WRN("fail to lock. error:%d", error);
+			break;
 	}
 
 	return ret;
@@ -177,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_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);
-		} 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;
 	}
 }
 
@@ -326,29 +304,15 @@ tbm_bo
 tbm_bo_alloc(tbm_bufmgr bufmgr, int size, int flags)
 {
 	tbm_bo bo;
-	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 = tbm_bufmgr_internal_alloc_bo(bufmgr, size, flags, &error);
+	bo = tbm_bufmgr_internal_alloc_bo(bufmgr, size, flags);
 	if (!bo) {
 		/* LCOV_EXCL_START */
-		TBM_ERR("tbm_bufmgr_internal_alloc_bo failed. error:%d", error);
-		_tbm_set_last_result(error);
-		_tbm_bufmgr_mutex_unlock();
+		TBM_ERR("tbm_bufmgr_internal_alloc_bo failed.");
 		return NULL;
 		/* LCOV_EXCL_STOP */
 	}
 
-	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;
 }
 
@@ -408,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 */
@@ -447,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();
@@ -466,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 */
@@ -504,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
@@ -521,7 +437,7 @@ tbm_bo_get_handle(tbm_bo bo, int device)
 
 	TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), (tbm_bo_handle) NULL);
 
-	bo_handle = tbm_module_bo_get_handle(bo->bufmgr->module, bo, bo->bo_data, device, &error);
+	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);
@@ -549,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;
@@ -605,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();
@@ -613,85 +493,36 @@ 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_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);
-
-	bo = tbm_bufmgr_internal_import_bo_with_key(bufmgr, key, &error);
+	bo = tbm_bufmgr_internal_import_bo_with_key(bufmgr, key);
 	if (!bo) {
 		/* LCOV_EXCL_START */
-		TBM_ERR("tbm_bufmgr_internal_import_key failed. error:%d", error);
-		_tbm_set_last_result(error);
-		_tbm_bufmgr_mutex_unlock();
+		TBM_ERR("tbm_bufmgr_internal_import_bo_with_key failed");
 		return NULL;
 		/* LCOV_EXCL_STOP */
 	}
 
-	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;
 }
 
@@ -699,30 +530,15 @@ tbm_bo
 tbm_bo_import_fd(tbm_bufmgr bufmgr, tbm_fd fd)
 {
 	tbm_bo bo;
-	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);
-
-	bo = tbm_bufmgr_internal_import_bo_with_fd(bufmgr, fd, &error);
+	bo = tbm_bufmgr_internal_import_bo_with_fd(bufmgr, fd);
 	if (!bo) {
 		/* LCOV_EXCL_START */
-		TBM_ERR("tbm_bufmgr_internal_import_fd failed. error:%d", error);
-		_tbm_set_last_result(error);
-		_tbm_bufmgr_mutex_unlock();
+		TBM_ERR("tbm_bufmgr_internal_import_fd failed.");
 		return NULL;
 		/* LCOV_EXCL_STOP */
 	}
 
-	LIST_INITHEAD(&bo->user_data_list); // TODO: remove this. build-break when it is removed.
-
-	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;
 }
 
@@ -737,7 +553,7 @@ tbm_bo_size(tbm_bo bo)
 
 	TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0);
 
-	size = tbm_module_bo_get_size(bo->bufmgr->module, bo, bo->bo_data, &error);
+	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);
@@ -789,9 +605,9 @@ tbm_bo_swap(tbm_bo bo1, tbm_bo bo2)
 
 	TBM_TRACE_BO("before: bo1(%p) bo2(%p)\n", bo1, bo2);
 
-	size1 = tbm_module_bo_get_size(bo1->bufmgr->module, bo1, bo1->bo_data, &error1);
+	size1 = tbm_bo_data_get_size(bo1->bo_data, &error1);
 	_tbm_set_last_result(error1);
-	size2 = tbm_module_bo_get_size(bo2->bufmgr->module, bo2, bo2->bo_data, &error2);
+	size2 = tbm_bo_data_get_size(bo2->bo_data, &error2);
 	_tbm_set_last_result(error2);
 
 	if (size1 != size2) {
@@ -800,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();
 
@@ -1000,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) {
@@ -1013,7 +830,7 @@ _tbm_bo_free(tbm_bo bo)
 		bo->lock_cnt--;
 	}
 
-	tbm_module_bo_free(bo->bufmgr->module, bo, bo->bo_data, bo->get_from_hal_surface);
+	tbm_bo_data_free(bo->bo_data, bo->get_from_surface_data);
 
 	_tbm_bo_deinit(bo);