From: Boram Park <boram1288.park@samsung.com>
Date: Tue, 22 Mar 2016 12:55:45 +0000 (+0900)
Subject: Revert "add display_buffer_get_fd to TDM backend interface"
X-Git-Tag: submit/tizen/20160414.040521~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=47d129b17e0e94e997bd4c438c531a8f4f560bda;p=platform%2Fcore%2Fuifw%2Flibtdm.git

Revert "add display_buffer_get_fd to TDM backend interface"

This reverts commit 748a516c6f3f754be4ff0e32d21a0985839cbea1.

Conflicts:
	include/tdm_backend.h
	src/tdm.c
	src/tdm_private.h

Change-Id: Ida5296ea6fcc210cabb62361d416afca3cfbc691
---

diff --git a/include/tdm_backend.h b/include/tdm_backend.h
index bc9d1955..f240d410 100644
--- a/include/tdm_backend.h
+++ b/include/tdm_backend.h
@@ -287,16 +287,6 @@ typedef struct _tdm_func_display {
 	 */
 	tdm_error (*display_get_fd)(tdm_backend_data *bdata, int *fd);
 
-	/**
-	 * @brief Get the file descriptor for the memory-management framework of a backend module
-	 * @param[in] bdata The backend module data
-	 * @param[out] fd The fd of a backend module
-	 * @return #TDM_ERROR_NONE if success. Otherwise, error value.
-	 * @see display_handle_events() function of #tdm_func_display
-	 * This buffer fd will be passed to tbm_bufmgr_init.
-	 */
-	tdm_error (*display_get_buffer_fd)(tdm_backend_data *bdata, int *fd);
-
 	/**
 	 * @brief Handle the events which happens on the fd of a backend module
 	 * @param[in] bdata The backend module data
diff --git a/src/tdm.c b/src/tdm.c
index 2933a23c..a7451f1f 100644
--- a/src/tdm.c
+++ b/src/tdm.c
@@ -451,33 +451,6 @@ failed_update:
 	return ret;
 }
 
-static tdm_error
-_tdm_display_init_bufmgr(tdm_private_display *private_display)
-{
-	tdm_func_display *func_display = &private_display->func_display;
-	int buffer_fd = -1;
-	tdm_error ret;
-
-	if (func_display->display_get_buffer_fd) {
-		ret = func_display->display_get_buffer_fd(private_display->bdata, &buffer_fd);
-		if (ret != TDM_ERROR_NONE) {
-			TDM_ERR("failed to get buffer fd");
-			return ret;
-		}
-	}
-
-	private_display->bufmgr = tbm_bufmgr_init(buffer_fd);
-	if (!private_display->bufmgr) {
-		TDM_ERR("failed to init TBM bufmgr: fd(%d)", buffer_fd);
-		return TDM_ERROR_OUT_OF_MEMORY;
-	}
-
-	TDM_INFO("init TBM bufmgr: fd(%d)", buffer_fd);
-
-	return TDM_ERROR_NONE;
-}
-
-
 EXTERN tdm_error
 tdm_display_update(tdm_display *dpy)
 {
@@ -764,12 +737,6 @@ tdm_display_init(tdm_error *error)
 	if (ret != TDM_ERROR_NONE)
 		goto failed_update;
 
-	TDM_TRACE_BEGIN(Bufmgr_Init);
-	ret = _tdm_display_init_bufmgr(private_display);
-	TDM_TRACE_END();
-	if (ret != TDM_ERROR_NONE)
-		goto failed_update;
-
 	private_display->init_count = 1;
 
 	g_private_display = private_display;
@@ -814,9 +781,6 @@ tdm_display_deinit(tdm_display *dpy)
 
 	pthread_mutex_lock(&private_display->lock);
 
-	if (private_display->bufmgr)
-		tbm_bufmgr_deinit(private_display->bufmgr);
-
 	_tdm_display_destroy_private_display(private_display);
 	_tdm_display_unload_module(private_display);
 
diff --git a/src/tdm_private.h b/src/tdm_private.h
index fb0f7adb..c1a34d09 100644
--- a/src/tdm_private.h
+++ b/src/tdm_private.h
@@ -187,8 +187,6 @@ struct _tdm_private_display {
 	struct list_head pp_list;
 
 	void **outputs_ptr;
-
-	tbm_bufmgr bufmgr;
 };
 
 struct _tdm_private_output {