From patchwork Thu Oct 1 15:09:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Morton X-Patchwork-Id: 7309351 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C84CABEEA4 for ; Thu, 1 Oct 2015 15:09:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DEE84206A2 for ; Thu, 1 Oct 2015 15:09:24 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id E25B8206A7 for ; Thu, 1 Oct 2015 15:09:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 440FC6E2CE; Thu, 1 Oct 2015 08:09:23 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 03E3C6E2CE for ; Thu, 1 Oct 2015 08:09:21 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 01 Oct 2015 08:09:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,618,1437462000"; d="scan'208";a="817170757" Received: from djmorton-linux.isw.intel.com ([10.102.226.153]) by fmsmga002.fm.intel.com with ESMTP; 01 Oct 2015 08:09:19 -0700 From: Derek Morton To: intel-gfx@lists.freedesktop.org Date: Thu, 1 Oct 2015 16:09:02 +0100 Message-Id: <1443712142-20624-1-git-send-email-derek.j.morton@intel.com> X-Mailer: git-send-email 1.9.1 Cc: thomas.wood@intel.com Subject: [Intel-gfx] [PATCH i-g-t] benchmarks: Fix build errors on Android M-Dessert X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 #include #include @@ -57,12 +58,6 @@ #include #include -#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 #include #include @@ -53,13 +54,6 @@ #include #include #include -#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 #include #include @@ -56,13 +57,6 @@ #include #include #include -#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 #include #include @@ -49,13 +50,6 @@ #include #include #include -#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 #include #include +#include #include "intel_chipset.h" #include "intel_reg.h"