summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Morton <derek.j.morton@intel.com>2015-10-01 16:09:02 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-10-02 09:42:30 +0200
commit1b492e311ce13fe4bc42f1edd5479441662d4855 (patch)
tree69d9d3340bbd68602a9e43404ab3d1f06274b72e
parent983dfe5b68e2e18006cee78811ff387735386fa1 (diff)
benchmarks: Fix build errors on Android M-Dessert
Android M-Dessert treats implicit declaration of function warnings as errors resulting in igt failing to build. This patch fixes the errors by including missing header files as required. Mostly this involved including igt.h in the benchmarks. Signed-off-by: Derek Morton <derek.j.morton@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--benchmarks/intel_upload_blit_large.c7
-rw-r--r--benchmarks/intel_upload_blit_large_gtt.c8
-rw-r--r--benchmarks/intel_upload_blit_large_map.c8
-rw-r--r--benchmarks/intel_upload_blit_small.c8
-rw-r--r--tools/intel_reg_decode.c1
5 files changed, 5 insertions, 27 deletions
diff --git a/benchmarks/intel_upload_blit_large.c b/benchmarks/intel_upload_blit_large.c
index 1984bfde..12bbae3d 100644
--- a/benchmarks/intel_upload_blit_large.c
+++ b/benchmarks/intel_upload_blit_large.c
@@ -44,6 +44,7 @@
* The current workload doing this path is pixmap upload for non-KMS.
*/
+#include "igt.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -57,12 +58,6 @@
#include <drm.h>
#include <i915_drm.h>
-#include "drmtest.h"
-#include "intel_bufmgr.h"
-#include "intel_batchbuffer.h"
-#include "intel_io.h"
-#include "intel_chipset.h"
-
#define OBJECT_WIDTH 1280
#define OBJECT_HEIGHT 720
diff --git a/benchmarks/intel_upload_blit_large_gtt.c b/benchmarks/intel_upload_blit_large_gtt.c
index d62a01ea..0b704b57 100644
--- a/benchmarks/intel_upload_blit_large_gtt.c
+++ b/benchmarks/intel_upload_blit_large_gtt.c
@@ -44,6 +44,7 @@
* The current workload doing this path is pixmap upload in 2D with KMS.
*/
+#include "igt.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -53,13 +54,6 @@
#include <errno.h>
#include <sys/stat.h>
#include <sys/time.h>
-#include "drm.h"
-#include "i915_drm.h"
-#include "drmtest.h"
-#include "intel_bufmgr.h"
-#include "intel_batchbuffer.h"
-#include "intel_io.h"
-#include "intel_chipset.h"
#define OBJECT_WIDTH 1280
#define OBJECT_HEIGHT 720
diff --git a/benchmarks/intel_upload_blit_large_map.c b/benchmarks/intel_upload_blit_large_map.c
index 03bf760f..ae05434f 100644
--- a/benchmarks/intel_upload_blit_large_map.c
+++ b/benchmarks/intel_upload_blit_large_map.c
@@ -47,6 +47,7 @@
* suitable)
*/
+#include "igt.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -56,13 +57,6 @@
#include <errno.h>
#include <sys/stat.h>
#include <sys/time.h>
-#include "drm.h"
-#include "i915_drm.h"
-#include "drmtest.h"
-#include "intel_bufmgr.h"
-#include "intel_batchbuffer.h"
-#include "intel_io.h"
-#include "intel_chipset.h"
#define OBJECT_WIDTH 1280
#define OBJECT_HEIGHT 720
diff --git a/benchmarks/intel_upload_blit_small.c b/benchmarks/intel_upload_blit_small.c
index ac557a4e..7e3346eb 100644
--- a/benchmarks/intel_upload_blit_small.c
+++ b/benchmarks/intel_upload_blit_small.c
@@ -40,6 +40,7 @@
* frame.
*/
+#include "igt.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -49,13 +50,6 @@
#include <errno.h>
#include <sys/stat.h>
#include <sys/time.h>
-#include "drm.h"
-#include "i915_drm.h"
-#include "drmtest.h"
-#include "intel_bufmgr.h"
-#include "intel_batchbuffer.h"
-#include "intel_io.h"
-#include "intel_chipset.h"
/* Happens to be 128k, the size of the VBOs used by i965's Mesa driver. */
#define OBJECT_WIDTH 256
diff --git a/tools/intel_reg_decode.c b/tools/intel_reg_decode.c
index 4f97d993..bb8f5b30 100644
--- a/tools/intel_reg_decode.c
+++ b/tools/intel_reg_decode.c
@@ -31,6 +31,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <strings.h>
#include "intel_chipset.h"
#include "intel_reg.h"