intel: kill intel_memman.[hc]

Inline the 4 almost trivial lines in their only respective callsites.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

5 files changed, 5 insertions, 62 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 7a8de4d..e19b01c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -64,7 +64,6 @@ source_c = \
 	intel_batchbuffer.c	\
 	intel_batchbuffer_dump.c\
 	intel_driver.c		\
-	intel_memman.c		\
 	object_heap.c		\
 	$(NULL)
 
@@ -90,7 +89,6 @@ source_h = \
 	intel_batchbuffer_dump.h\
 	intel_compiler.h	\
 	intel_driver.h          \
-	intel_memman.h          \
 	object_heap.h           \
 	$(NULL)
 
diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c
index 4ba1aa6..dac2b29 100644
--- a/src/i965_drv_video.c
+++ b/src/i965_drv_video.c
@@ -36,7 +36,6 @@
 #include <va/va_dricommon.h>
 
 #include "intel_driver.h"
-#include "intel_memman.h"
 #include "intel_batchbuffer.h"
 #include "i965_defines.h"
 #include "i965_drv_video.h"
diff --git a/src/intel_driver.c b/src/intel_driver.c
index 6a296dc..2b155ca 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -32,7 +32,6 @@
 #include <va/va_dricommon.h>
 
 #include "intel_batchbuffer.h"
-#include "intel_memman.h"
 #include "intel_driver.h"
 
 static Bool
@@ -71,7 +70,10 @@ intel_driver_init(VADriverContextP ctx)
     if (intel_driver_get_param(intel, I915_PARAM_HAS_BLT, &has_blt))
         intel->has_blt = has_blt;
 
-    intel_memman_init(intel);
+    intel->bufmgr = intel_bufmgr_gem_init(intel->fd, BATCH_SIZE);
+    assert(intel->bufmgr);
+    intel_bufmgr_gem_enable_reuse(intel->bufmgr);
+
     return True;
 }
 
@@ -80,7 +82,7 @@ intel_driver_terminate(VADriverContextP ctx)
 {
     struct intel_driver_data *intel = intel_driver_data(ctx);
 
-    intel_memman_terminate(intel);
+    drm_intel_bufmgr_destroy(intel->bufmgr);
     pthread_mutex_destroy(&intel->ctxmutex);
 
     return True;
diff --git a/src/intel_memman.c b/src/intel_memman.c
deleted file mode 100644
index 7d56e96..0000000
--- a/src/intel_memman.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright © 2009 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Xiang Haihao <haihao.xiang@intel.com>
- *    Zou Nan hai <nanhai.zou@intel.com>
- *
- */
-
-#include <assert.h>
-
-#include "intel_driver.h"
-
-Bool 
-intel_memman_init(struct intel_driver_data *intel)
-{
-    intel->bufmgr = intel_bufmgr_gem_init(intel->fd, BATCH_SIZE);
-    assert(intel->bufmgr);
-    intel_bufmgr_gem_enable_reuse(intel->bufmgr);
-
-    return True;
-}
-
-Bool 
-intel_memman_terminate(struct intel_driver_data *intel)
-{
-    drm_intel_bufmgr_destroy(intel->bufmgr);
-    return True;
-}
diff --git a/src/intel_memman.h b/src/intel_memman.h
deleted file mode 100644
index 4e516e5..0000000
--- a/src/intel_memman.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _INTEL_MEMMAN_H_
-#define _INTEL_MEMMAN_H_
-
-Bool intel_memman_init(struct intel_driver_data *intel);
-Bool intel_memman_terminate(struct intel_driver_data *intel);
-
-#endif /* _INTEL_MEMMAN_H_ */