| Message ID | 1443712142-20624-1-git-send-email-derek.j.morton@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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
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"
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> --- 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(-)