From: Daniel Vetter <daniel@ffwll.ch>
To: Derek Morton <derek.j.morton@intel.com>
Cc: intel-gfx@lists.freedesktop.org, thomas.wood@intel.com
Subject: Re: [PATCH i-g-t] benchmarks: Fix build errors on Android M-Dessert
Date: Fri, 2 Oct 2015 09:42:47 +0200 [thread overview]
Message-ID: <20151002074247.GC3383@phenom.ffwll.local> (raw)
In-Reply-To: <1443712142-20624-1-git-send-email-derek.j.morton@intel.com>
On Thu, Oct 01, 2015 at 04:09:02PM +0100, Derek Morton wrote:
> 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>
Applied, thanks.
-Daniel
> ---
> benchmarks/intel_upload_blit_large.c | 7 +------
> benchmarks/intel_upload_blit_large_gtt.c | 8 +-------
> benchmarks/intel_upload_blit_large_map.c | 8 +-------
> benchmarks/intel_upload_blit_small.c | 8 +-------
> tools/intel_reg_decode.c | 1 +
> 5 files changed, 5 insertions(+), 27 deletions(-)
>
> diff --git a/benchmarks/intel_upload_blit_large.c b/benchmarks/intel_upload_blit_large.c
> index 1984bfd..12bbae3 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 d62a01e..0b704b5 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 03bf760..ae05434 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 ac557a4..7e3346e 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 4f97d99..bb8f5b3 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"
> --
> 1.9.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2015-10-02 7:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-01 15:09 [PATCH i-g-t] benchmarks: Fix build errors on Android M-Dessert Derek Morton
2015-10-02 7:42 ` Daniel Vetter [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151002074247.GC3383@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=derek.j.morton@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=thomas.wood@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox