From 47f4306a09526b2fc1b00d3d1521bf65e1263d25 Mon Sep 17 00:00:00 2001
From: SooChan Lim <sc1.lim@samsung.com>
Date: Tue, 15 Jun 2021 12:11:43 +0900
Subject: [PATCH] tbm_bo: remove tbm_bo_alloc_with_tiled_format

This function is internal function and it is not used anymore.
The bufmgr_func->bufmgr_alloc_bo_with_tiled_format backend func will
be deprecated.

Change-Id: Id933ac57cdbf337734d430570399725f7a218dac
---
 src/tbm_bo.c               | 72 ----------------------------------------------
 src/tbm_bufmgr_int.h       |  2 --
 src/tbm_surface_internal.c |  9 ++----
 3 files changed, 3 insertions(+), 80 deletions(-)

diff --git a/src/tbm_bo.c b/src/tbm_bo.c
index 0191ec5..eeccc8b 100644
--- a/src/tbm_bo.c
+++ b/src/tbm_bo.c
@@ -450,78 +450,6 @@ fail:
 }
 
 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);
-			goto bo_alloc_fail;
-		}
-	}
-
-	if (bufmgr->use_hal_tbm) {
-		hal_tbm_error ret;
-		bo_data = (tbm_backend_bo_data *)hal_tbm_bufmgr_alloc_bo_with_format(bufmgr->hal_bufmgr,
-								width, height, bpp, format, (hal_tbm_bo_memory_type)flags, bo_idx, &ret);
-		if (error)
-			*error = (tbm_error_e)ret;
-		if (ret != HAL_TBM_ERROR_NONE) {
-			if (ret != HAL_TBM_ERROR_NOT_SUPPORTED) {
-				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));
-				if (error)
-					_tbm_set_last_result(*error);
-			}
-			goto bo_alloc_fail;
-		}
-		bo->bo_data = bo_data;
-	} 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));
-			if (error)
-				_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);
-	_tbm_bufmgr_mutex_unlock();
-	return NULL;
-}
-
-tbm_bo
 tbm_bo_alloc_with_surface(tbm_bufmgr bufmgr, int width, int height, int format, int flags, int bo_idx)
 {
 	tbm_bo bo;
diff --git a/src/tbm_bufmgr_int.h b/src/tbm_bufmgr_int.h
index 64d5870..7edd03d 100644
--- a/src/tbm_bufmgr_int.h
+++ b/src/tbm_bufmgr_int.h
@@ -348,8 +348,6 @@ void _tbm_bufmgr_mutex_unlock(void);
 
 tbm_bo tbm_bo_alloc_with_format(tbm_bufmgr bufmgr, int format, int bo_idx, int width, int bpp,
 						int height, tbm_bo_memory_type flags, tbm_error_e *error);
-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 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);
 
diff --git a/src/tbm_surface_internal.c b/src/tbm_surface_internal.c
index 5f8ebcb..d4fab86 100644
--- a/src/tbm_surface_internal.c
+++ b/src/tbm_surface_internal.c
@@ -725,12 +725,9 @@ _tbm_surface_internal_create_surface(tbm_bufmgr bufmgr, int width, int height, i
 				/* LCOV_EXCL_STOP */
 			} else if (bufmgr->bufmgr_func->bufmgr_alloc_bo_with_tiled_format && (flags & TBM_BO_TILED)) {
 				/* LCOV_EXCL_START */
-				surf->bos[i] = tbm_bo_alloc_with_tiled_format(bufmgr, width, height, surf->info.bpp/8, format, flags, i, error);
-				if (!surf->bos[i]) {
-					TBM_ERR("fail to tbm_bo_alloc_with_tiled_format idx:%d\n", i);
-					*error = tbm_get_last_error();
-					goto alloc_bo_fail;
-				}
+				TBM_ERR("NOT SUPPORTED. idx:%d", i);
+				*error = TBM_ERROR_NOT_SUPPORTED;
+				goto alloc_bo_fail;
 				/* LCOV_EXCL_STOP */
 			} else {
 				surf->bos[i] = tbm_bo_alloc(bufmgr, bo_size, flags);
-- 
2.7.4