- Used only within kernel/*.c
- Remove the unused min/max macros
Cc: Eric Anholt <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
---
src/gallium/drivers/vc4/kernel/vc4_drv.h | 16 ++++++++++++++++
src/gallium/drivers/vc4/vc4_simulator_validate.h | 18 ------------------
2 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/src/gallium/drivers/vc4/kernel/vc4_drv.h
b/src/gallium/drivers/vc4/kernel/vc4_drv.h
index 45d9c40..c1092c0 100644
--- a/src/gallium/drivers/vc4/kernel/vc4_drv.h
+++ b/src/gallium/drivers/vc4/kernel/vc4_drv.h
@@ -26,6 +26,22 @@
#include "vc4_simulator_validate.h"
+#define DRM_INFO(...) fprintf(stderr, __VA_ARGS__)
+#define DRM_ERROR(...) fprintf(stderr, __VA_ARGS__)
+#define kmalloc(size, arg) malloc(size)
+#define kcalloc(size, count, arg) calloc(size, count)
+#define kfree(ptr) free(ptr)
+#define krealloc(ptr, size, args) realloc(ptr, size)
+#define roundup(x, y) align(x, y)
+#define BUG_ON(condition) assert(!(condition))
+
+static inline int
+copy_from_user(void *dst, void *src, size_t size)
+{
+ memcpy(dst, src, size);
+ return 0;
+}
+
enum vc4_bo_mode {
VC4_MODE_UNDECIDED,
VC4_MODE_TILE_ALLOC,
diff --git a/src/gallium/drivers/vc4/vc4_simulator_validate.h
b/src/gallium/drivers/vc4/vc4_simulator_validate.h
index d6c2aec..a893b30 100644
--- a/src/gallium/drivers/vc4/vc4_simulator_validate.h
+++ b/src/gallium/drivers/vc4/vc4_simulator_validate.h
@@ -36,24 +36,6 @@
struct exec_info;
-#define DRM_INFO(...) fprintf(stderr, __VA_ARGS__)
-#define DRM_ERROR(...) fprintf(stderr, __VA_ARGS__)
-#define kmalloc(size, arg) malloc(size)
-#define kcalloc(size, count, arg) calloc(size, count)
-#define kfree(ptr) free(ptr)
-#define krealloc(ptr, size, args) realloc(ptr, size)
-#define roundup(x, y) align(x, y)
-#define max(x, y) MAX2(x, y)
-#define min(x, y) MiN2(x, y)
-#define BUG_ON(condition) assert(!(condition))
-
-static inline int
-copy_from_user(void *dst, void *src, size_t size)
-{
- memcpy(dst, src, size);
- return 0;
-}
-
typedef uint8_t u8;
typedef uint16_t u16;
typedef uint32_t u32;
--
2.1.0
_______________________________________________
mesa-dev mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
