From patchwork Sat Sep 2 17:04:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9935665 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 B19A0603B5 for ; Sat, 2 Sep 2017 17:04:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A0099204C2 for ; Sat, 2 Sep 2017 17:04:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 93C2928488; Sat, 2 Sep 2017 17:04:34 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 283A428470 for ; Sat, 2 Sep 2017 17:04:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 887276E278; Sat, 2 Sep 2017 17:04:25 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8EE766E274 for ; Sat, 2 Sep 2017 17:04:24 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id p17so2793162wmd.3 for ; Sat, 02 Sep 2017 10:04:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Crzo/PX5ckzlj5MVawCGog+/d7EZPun+rcr8qeSDv/s=; b=Iu41Pluepc/GpYZLr5P/NtFxU4WOZBm+pGUVKZkh6r9XTU/wa/bbROWnuTsjYe2c8y 0iula4IeCvoc8SPXorfPjneinBdmLrhrdo2HKqSf+MwrZ3Wkow+9BUokq3D8fvjXeKHP 73KLYuew6kD7Jc3PtQXUeCwbmpsx6NmKCXIME= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Crzo/PX5ckzlj5MVawCGog+/d7EZPun+rcr8qeSDv/s=; b=Vd7wfxEWcuYLyAxLJtqAaDqPRZf7/WU19fmdf/Ro1Vw7/3a13X7vO3IxTypA6Uc14L NThzY81FLYdWgywwIj69z1vWH/YB6IOGl891HKTHIlS24M9yPPVLW1diAd+6S2O/syYs 2wt3NOs0SxIFGKPT6TKKcGAdiiiziU0k/utFfaEJ3pyhUbgOG/X3M/bfP/qEJIxntjRy pma8Kt1lnkRv97EadTkaERRXU0f/o2zxhcegZ9lG0Y9aKoSvzTB/eVhwHQBn5d6zLh/r mve6CjhwjE1wUofFwjdIMQLruwqBl/NwMr7ZqGafB1ZPqMTVHAsYts8x1BvxFamVnxwu vnQA== X-Gm-Message-State: AHPjjUjhouVVMlnYrH1YcnEL8GbTkkgDVHCXRKt8Iq7tFjt+RV5lWTgN qNIsaYcQNOjtsEg2s5Y= X-Google-Smtp-Source: ADKCNb5lXbnJFAm4+1Ki8riiFIy+ZHQPb2nQYGjj6541PmhzEiwOlHRQbT/Zb3e9c6amfcdhoxDXeA== X-Received: by 10.80.139.5 with SMTP id l5mr4483011edl.15.1504371862903; Sat, 02 Sep 2017 10:04:22 -0700 (PDT) Received: from wespe.ffwll.local ([2a02:168:5635:0:5890:4c8b:fe5f:efc1]) by smtp.gmail.com with ESMTPSA id j90sm1343151edb.20.2017.09.02.10.04.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 02 Sep 2017 10:04:21 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Sat, 2 Sep 2017 19:04:01 +0200 Message-Id: <20170902170406.8271-7-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20170902170406.8271-1-daniel.vetter@ffwll.ch> References: <20170902170406.8271-1-daniel.vetter@ffwll.ch> Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH i-g-t 07/12] lib: clean up header includes 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 Just a bit of OCD, I like it when connections within library modules are a bit more obvious. igt.h is ok for tests, but let's use individual include lines for libraries consistently. Also order standard includes before igt ones. Signed-off-by: Daniel Vetter --- lib/igt_alsa.c | 3 ++- lib/igt_alsa.h | 1 - lib/igt_audio.c | 3 ++- lib/igt_audio.h | 1 - lib/igt_chamelium.c | 6 +++++- lib/igt_chamelium.h | 6 +++++- lib/igt_dummyload.c | 11 +++++++++-- lib/igt_frame.c | 3 ++- lib/igt_frame.h | 1 - lib/igt_gvt.c | 10 +++++----- lib/igt_kmod.c | 6 +++--- lib/igt_sysfs.h | 1 + lib/igt_vgem.c | 10 +++++++--- lib/igt_vgem.h | 1 + 14 files changed, 42 insertions(+), 21 deletions(-) diff --git a/lib/igt_alsa.c b/lib/igt_alsa.c index b5574c7622a1..3ad0521aa6ee 100644 --- a/lib/igt_alsa.c +++ b/lib/igt_alsa.c @@ -28,7 +28,8 @@ #include -#include "igt.h" +#include "igt_alsa.h" +#include "igt_core.h" #define HANDLES_MAX 8 diff --git a/lib/igt_alsa.h b/lib/igt_alsa.h index 8f7724ad9727..50795130a4f8 100644 --- a/lib/igt_alsa.h +++ b/lib/igt_alsa.h @@ -29,7 +29,6 @@ #include "config.h" -#include "igt.h" #include struct alsa; diff --git a/lib/igt_audio.c b/lib/igt_audio.c index 6b35529aa224..2321d1c6e3f1 100644 --- a/lib/igt_audio.c +++ b/lib/igt_audio.c @@ -29,7 +29,8 @@ #include #include -#include "igt.h" +#include "igt_audio.h" +#include "igt_core.h" #define FREQS_MAX 8 diff --git a/lib/igt_audio.h b/lib/igt_audio.h index 21adfee82756..b3b658a4017f 100644 --- a/lib/igt_audio.h +++ b/lib/igt_audio.h @@ -29,7 +29,6 @@ #include "config.h" -#include "igt.h" #include struct audio_signal; diff --git a/lib/igt_chamelium.c b/lib/igt_chamelium.c index dcd8855f3d1b..fb250366ca2c 100644 --- a/lib/igt_chamelium.c +++ b/lib/igt_chamelium.c @@ -35,7 +35,11 @@ #include #include -#include "igt.h" +#include "igt_chamelium.h" +#include "igt_core.h" +#include "igt_aux.h" +#include "igt_kms.h" +#include "igt_frame.h" /** * SECTION:igt_chamelium diff --git a/lib/igt_chamelium.h b/lib/igt_chamelium.h index a2d626eca957..af9655a0b1cf 100644 --- a/lib/igt_chamelium.h +++ b/lib/igt_chamelium.h @@ -28,8 +28,12 @@ #include "config.h" -#include "igt.h" #include +#include + +#include "igt_debugfs.h" + +struct igt_fb; struct chamelium; struct chamelium_port; diff --git a/lib/igt_dummyload.c b/lib/igt_dummyload.c index f2a94b5572ea..a2061ff6138e 100644 --- a/lib/igt_dummyload.c +++ b/lib/igt_dummyload.c @@ -22,11 +22,18 @@ * */ -#include "igt.h" -#include "igt_dummyload.h" #include #include #include +#include + +#include + +#include "igt_dummyload.h" +#include "igt_gt.h" +#include "intel_batchbuffer.h" +#include "intel_chipset.h" +#include "ioctl_wrappers.h" /** * SECTION:igt_dummyload diff --git a/lib/igt_frame.c b/lib/igt_frame.c index 0f6bca243e39..6984c02e9912 100644 --- a/lib/igt_frame.c +++ b/lib/igt_frame.c @@ -32,7 +32,8 @@ #include #include -#include "igt.h" +#include "igt_frame.h" +#include "igt_core.h" /** * SECTION:igt_frame diff --git a/lib/igt_frame.h b/lib/igt_frame.h index 680ad5bbd293..11f96cbea203 100644 --- a/lib/igt_frame.h +++ b/lib/igt_frame.h @@ -29,7 +29,6 @@ #include "config.h" -#include "igt.h" #include bool igt_frame_dump_is_enabled(void); diff --git a/lib/igt_gvt.c b/lib/igt_gvt.c index a78e98e9f233..acbc349145ce 100644 --- a/lib/igt_gvt.c +++ b/lib/igt_gvt.c @@ -21,16 +21,16 @@ * IN THE SOFTWARE. */ -#include "igt.h" -#include "igt_gvt.h" -#include "igt_sysfs.h" -#include "igt_kmod.h" - #include #include #include #include +#include "igt_gvt.h" +#include "igt_sysfs.h" +#include "igt_kmod.h" +#include "drmtest.h" + /** * SECTION:igt_gvt * @short_description: Graphics virtualization technology library diff --git a/lib/igt_kmod.c b/lib/igt_kmod.c index 26691e308cbd..58624cd12f32 100644 --- a/lib/igt_kmod.c +++ b/lib/igt_kmod.c @@ -21,13 +21,13 @@ * IN THE SOFTWARE. */ -#include "igt.h" +#include +#include + #include "igt_core.h" #include "igt_sysfs.h" #include "igt_kmod.h" -#include - /** * SECTION:igt_kmod * @short_description: Wrappers around libkmod for module loading/unloading diff --git a/lib/igt_sysfs.h b/lib/igt_sysfs.h index d666438a667a..07e75042307a 100644 --- a/lib/igt_sysfs.h +++ b/lib/igt_sysfs.h @@ -26,6 +26,7 @@ #define __IGT_SYSFS_H__ #include +#include int igt_sysfs_open(int device, int *idx); int igt_sysfs_open_parameters(int device); diff --git a/lib/igt_vgem.c b/lib/igt_vgem.c index 3dd9621d0459..7f933b23bd4f 100644 --- a/lib/igt_vgem.c +++ b/lib/igt_vgem.c @@ -21,10 +21,14 @@ * IN THE SOFTWARE. */ -#include "igt.h" -#include "igt_vgem.h" - #include +#include +#include +#include + +#include "igt_vgem.h" +#include "igt_core.h" +#include "ioctl_wrappers.h" /** * SECTION:igt_vgem diff --git a/lib/igt_vgem.h b/lib/igt_vgem.h index 002ad7f09ceb..92045f0e7a81 100644 --- a/lib/igt_vgem.h +++ b/lib/igt_vgem.h @@ -25,6 +25,7 @@ #define IGT_VGEM_H #include +#include struct vgem_bo { uint32_t handle;