From patchwork Fri May 20 22:59:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 9130161 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0CB5260762 for ; Fri, 20 May 2016 23:00:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F1FC327C23 for ; Fri, 20 May 2016 23:00:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E31BC27CC9; Fri, 20 May 2016 23:00:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C70227C23 for ; Fri, 20 May 2016 23:00:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6FCAE6EB25; Fri, 20 May 2016 23:00:31 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6D27E6EB25 for ; Fri, 20 May 2016 22:59:56 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: robertfoss) with ESMTPSA id 575C4260F5E From: robert.foss@collabora.com To: daniel.vetter@ffwll.ch, daniel.stone@collabora.com, marius.c.vlad@intel.com, tomeu.vizoso@collabora.com, emil.velikov@collabora.com Date: Fri, 20 May 2016 18:59:32 -0400 Message-Id: <1463785173-17557-9-git-send-email-robert.foss@collabora.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1463785173-17557-1-git-send-email-robert.foss@collabora.com> References: <1463785173-17557-1-git-send-email-robert.foss@collabora.com> Cc: intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [RFC i-g-t 8/9] lib: Replace intel specific header includes with intel_drm_stubs.h. 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-Virus-Scanned: ClamAV using ClamSMTP From: Robert Foss Replace intel specific header includes with intel_drm_stubs.h. The stubbed functions will all call igt_require(false) and cause a skip. Signed-off-by: Robert Foss --- lib/drmtest.c | 2 +- lib/gpgpu_fill.c | 7 +++---- lib/igt_aux.c | 2 +- lib/igt_aux.h | 3 ++- lib/igt_debugfs.c | 4 ++-- lib/igt_draw.h | 3 +-- lib/igt_fb.h | 3 ++- lib/igt_kms.c | 3 +-- lib/intel_batchbuffer.c | 4 ---- lib/intel_batchbuffer.h | 3 +-- lib/intel_chipset.c | 2 +- lib/ioctl_wrappers.c | 1 - lib/ioctl_wrappers.h | 4 ++-- lib/media_fill_gen7.c | 3 +-- lib/media_fill_gen8.c | 4 +--- lib/media_fill_gen8lp.c | 6 ++---- lib/media_fill_gen9.c | 4 +--- lib/media_spin.c | 2 -- lib/rendercopy_gen6.c | 5 ++--- lib/rendercopy_gen7.c | 4 +--- lib/rendercopy_gen8.c | 4 +--- lib/rendercopy_gen9.c | 5 +---- lib/rendercopy_i830.c | 5 +---- lib/rendercopy_i915.c | 9 +++------ 24 files changed, 31 insertions(+), 61 deletions(-) diff --git a/lib/drmtest.c b/lib/drmtest.c index 7d6b74a..f043607 100644 --- a/lib/drmtest.c +++ b/lib/drmtest.c @@ -48,13 +48,13 @@ #include #include "drmtest.h" -#include "i915_drm.h" #include "intel_chipset.h" #include "intel_io.h" #include "igt_gt.h" #include "igt_debugfs.h" #include "version.h" #include "config.h" +#include "intel_drm_stubs.h" #include "intel_reg.h" #include "ioctl_wrappers.h" diff --git a/lib/gpgpu_fill.c b/lib/gpgpu_fill.c index 4d98643..62b1161 100644 --- a/lib/gpgpu_fill.c +++ b/lib/gpgpu_fill.c @@ -25,15 +25,14 @@ * Dominik Zeromski */ -#include -#include -#include "intel_reg.h" #include "drmtest.h" -#include "intel_batchbuffer.h" #include "gen7_media.h" #include "gen8_media.h" #include "gpgpu_fill.h" +#include "intel_batchbuffer.h" +#include "intel_drm_stubs.h" +#include "intel_reg.h" /* shaders/gpgpu/gpgpu_fill.gxa */ static const uint32_t gen7_gpgpu_kernel[][4] = { diff --git a/lib/igt_aux.c b/lib/igt_aux.c index fe18365..772c902 100644 --- a/lib/igt_aux.c +++ b/lib/igt_aux.c @@ -52,12 +52,12 @@ #include #include "drmtest.h" -#include "i915_drm.h" #include "intel_chipset.h" #include "igt_aux.h" #include "igt_debugfs.h" #include "igt_gt.h" #include "config.h" +#include "intel_drm_stubs.h" #include "intel_reg.h" #include "ioctl_wrappers.h" #include "igt_kms.h" diff --git a/lib/igt_aux.h b/lib/igt_aux.h index f66de72..c66121b 100644 --- a/lib/igt_aux.h +++ b/lib/igt_aux.h @@ -28,10 +28,11 @@ #ifndef IGT_AUX_H #define IGT_AUX_H -#include #include #include +#include "intel_drm_stubs.h" + extern drm_intel_bo **trash_bos; extern int num_trash_bos; diff --git a/lib/igt_debugfs.c b/lib/igt_debugfs.c index a32ed78..d9f371f 100644 --- a/lib/igt_debugfs.c +++ b/lib/igt_debugfs.c @@ -32,12 +32,12 @@ #include #include #include -#include #include "drmtest.h" +#include "intel_drm_stubs.h" #include "igt_aux.h" -#include "igt_kms.h" #include "igt_debugfs.h" +#include "igt_kms.h" /** * SECTION:igt_debugfs diff --git a/lib/igt_draw.h b/lib/igt_draw.h index b030131..c0e95ca 100644 --- a/lib/igt_draw.h +++ b/lib/igt_draw.h @@ -25,9 +25,8 @@ #ifndef __IGT_DRAW_H__ #define __IGT_DRAW_H__ -#include #include "igt_fb.h" - +#include "intel_drm_stubs.h" /** * igt_draw_method: * @IGT_DRAW_MMAP_CPU: draw using a CPU mmap. diff --git a/lib/igt_fb.h b/lib/igt_fb.h index ce2cc0f..82dbacb 100644 --- a/lib/igt_fb.h +++ b/lib/igt_fb.h @@ -38,10 +38,11 @@ typedef struct _cairo cairo_t; #include #include +#include #include #include -#include +#include "intel_drm_stubs.h" /* helpers to create nice-looking framebuffers */ struct igt_fb { diff --git a/lib/igt_kms.c b/lib/igt_kms.c index f85be1e..7afee53 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -41,12 +41,11 @@ #include #include -#include - #include "drmtest.h" #include "igt_kms.h" #include "igt_aux.h" #include "intel_chipset.h" +#include "intel_drm_stubs.h" #include "igt_debugfs.h" /* list of connectors that need resetting on exit */ diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c index 692521f..a28eb33 100644 --- a/lib/intel_batchbuffer.c +++ b/lib/intel_batchbuffer.c @@ -31,10 +31,8 @@ #include #include -#include "drm.h" #include "drmtest.h" #include "intel_batchbuffer.h" -#include "intel_bufmgr.h" #include "intel_chipset.h" #include "intel_reg.h" #include "rendercopy.h" @@ -43,8 +41,6 @@ #include "media_spin.h" #include "gpgpu_fill.h" -#include - /** * SECTION:intel_batchbuffer * @short_description: Batchbuffer and blitter support diff --git a/lib/intel_batchbuffer.h b/lib/intel_batchbuffer.h index 869747d..bd365db 100644 --- a/lib/intel_batchbuffer.h +++ b/lib/intel_batchbuffer.h @@ -2,10 +2,9 @@ #define INTEL_BATCHBUFFER_H #include -#include -#include #include "igt_core.h" +#include "intel_drm_stubs.h" #include "intel_reg.h" #define BATCH_SZ 4096 diff --git a/lib/intel_chipset.c b/lib/intel_chipset.c index 56746b0..6ac74e9 100644 --- a/lib/intel_chipset.c +++ b/lib/intel_chipset.c @@ -36,9 +36,9 @@ #include #include #include -#include "i915_drm.h" #include "drmtest.h" +#include "intel_drm_stubs.h" #include "intel_chipset.h" #include "igt_core.h" diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c index f224091..e46811a 100644 --- a/lib/ioctl_wrappers.c +++ b/lib/ioctl_wrappers.c @@ -50,7 +50,6 @@ #include #include "drmtest.h" -#include "i915_drm.h" #include "intel_chipset.h" #include "intel_io.h" #include "igt_debugfs.h" diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h index 8fe35b0..aa8c60f 100644 --- a/lib/ioctl_wrappers.h +++ b/lib/ioctl_wrappers.h @@ -32,8 +32,8 @@ #include #include -#include -#include + +#include "intel_drm_stubs.h" extern int (*igt_ioctl)(int fd, unsigned long request, void *arg); diff --git a/lib/media_fill_gen7.c b/lib/media_fill_gen7.c index 6fb4479..5ec8502 100644 --- a/lib/media_fill_gen7.c +++ b/lib/media_fill_gen7.c @@ -1,9 +1,8 @@ -#include -#include #include "media_fill.h" #include "gen7_media.h" #include "intel_reg.h" +#include "intel_drm_stubs.h" #include "drmtest.h" #include diff --git a/lib/media_fill_gen8.c b/lib/media_fill_gen8.c index 4a8fe5a..a1e1fe4 100644 --- a/lib/media_fill_gen8.c +++ b/lib/media_fill_gen8.c @@ -1,8 +1,6 @@ -#include -#include - #include "media_fill.h" #include "gen8_media.h" +#include "intel_drm_stubs.h" #include "intel_reg.h" #include "drmtest.h" diff --git a/lib/media_fill_gen8lp.c b/lib/media_fill_gen8lp.c index 1f8a4ad..eed26ee 100644 --- a/lib/media_fill_gen8lp.c +++ b/lib/media_fill_gen8lp.c @@ -1,13 +1,11 @@ -#include -#include +#include #include "media_fill.h" #include "gen8_media.h" +#include "intel_drm_stubs.h" #include "intel_reg.h" #include "drmtest.h" -#include - static const uint32_t media_kernel[][4] = { { 0x00400001, 0x20202288, 0x00000020, 0x00000000 }, diff --git a/lib/media_fill_gen9.c b/lib/media_fill_gen9.c index 3fd2181..902b28b 100644 --- a/lib/media_fill_gen9.c +++ b/lib/media_fill_gen9.c @@ -1,8 +1,6 @@ -#include -#include - #include "media_fill.h" #include "gen8_media.h" +#include "intel_drm_stubs.h" #include "intel_reg.h" #include diff --git a/lib/media_spin.c b/lib/media_spin.c index 580c109..f4a432a 100644 --- a/lib/media_spin.c +++ b/lib/media_spin.c @@ -24,8 +24,6 @@ * Jeff McGee */ -#include -#include #include "intel_reg.h" #include "drmtest.h" #include "intel_batchbuffer.h" diff --git a/lib/rendercopy_gen6.c b/lib/rendercopy_gen6.c index 8c24cf8..d5207d5 100644 --- a/lib/rendercopy_gen6.c +++ b/lib/rendercopy_gen6.c @@ -9,11 +9,10 @@ #include #include #include -#include "drm.h" -#include "i915_drm.h" + #include "drmtest.h" -#include "intel_bufmgr.h" #include "intel_batchbuffer.h" +#include "intel_drm_stubs.h" #include "intel_io.h" #include "rendercopy.h" #include "gen6_render.h" diff --git a/lib/rendercopy_gen7.c b/lib/rendercopy_gen7.c index 3b92406..dc48a99 100644 --- a/lib/rendercopy_gen7.c +++ b/lib/rendercopy_gen7.c @@ -9,10 +9,8 @@ #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" diff --git a/lib/rendercopy_gen8.c b/lib/rendercopy_gen8.c index a7fc2c4..6fbb680 100644 --- a/lib/rendercopy_gen8.c +++ b/lib/rendercopy_gen8.c @@ -10,12 +10,10 @@ #include #include -#include -#include #include "drmtest.h" -#include "intel_bufmgr.h" #include "intel_batchbuffer.h" +#include "intel_drm_stubs.h" #include "intel_io.h" #include "rendercopy.h" #include "gen8_render.h" diff --git a/lib/rendercopy_gen9.c b/lib/rendercopy_gen9.c index 9537480..d575ddf 100644 --- a/lib/rendercopy_gen9.c +++ b/lib/rendercopy_gen9.c @@ -11,12 +11,9 @@ #include #include -#include -#include - #include "drmtest.h" -#include "intel_bufmgr.h" #include "intel_batchbuffer.h" +#include "intel_drm_stubs.h" #include "intel_io.h" #include "rendercopy.h" #include "gen9_render.h" diff --git a/lib/rendercopy_i830.c b/lib/rendercopy_i830.c index 04215b1..738d4d2 100644 --- a/lib/rendercopy_i830.c +++ b/lib/rendercopy_i830.c @@ -8,13 +8,10 @@ #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 "i830_reg.h" #include "rendercopy.h" diff --git a/lib/rendercopy_i915.c b/lib/rendercopy_i915.c index fc9583c..8846fdc 100644 --- a/lib/rendercopy_i915.c +++ b/lib/rendercopy_i915.c @@ -8,15 +8,12 @@ #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 "drmtest.h" #include "i915_reg.h" #include "i915_3d.h" +#include "intel_batchbuffer.h" +#include "intel_io.h" #include "rendercopy.h" void gen3_render_copyfunc(struct intel_batchbuffer *batch,