From patchwork Sun Mar 23 14:18:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3879121 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4C5FDBF540 for ; Sun, 23 Mar 2014 14:19:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2F0692018E for ; Sun, 23 Mar 2014 14:19:42 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A24E7201F4 for ; Sun, 23 Mar 2014 14:19:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 078AC6E694; Sun, 23 Mar 2014 07:19:40 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ee0-f46.google.com (mail-ee0-f46.google.com [74.125.83.46]) by gabe.freedesktop.org (Postfix) with ESMTP id B41996E69C for ; Sun, 23 Mar 2014 07:19:37 -0700 (PDT) Received: by mail-ee0-f46.google.com with SMTP id t10so3492873eei.19 for ; Sun, 23 Mar 2014 07:19:37 -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=Mo9XYCR+q8/u7EU13Fz0IL+OEbxAsaBCYLHS2KzwqS0=; b=JezFrvst7zvrrAZ1VoxP0YUl9uAl6PKTvo8C5MO+ynAdrFeRD3VCCxwstBFYGaOAFD rECoH1Zy2lSkooUr19jZv8yGCg+N47n8NZ22xhba3qoXYib4sgjac5Di8B6T1cbVjPHN ymQVHSaIsEgYUz0qZ3ua1g1TCfZIBtueWisoI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Mo9XYCR+q8/u7EU13Fz0IL+OEbxAsaBCYLHS2KzwqS0=; b=fLoGWGSqeK38DnFlt9oW9qJnRfJV7ute9FmNWzoI81C7cquVvW5OtEw0gaLCA/MTQo MEYl18At5EKPriH29CrW2wRnBs54alhIl1dF/dRsTRaUW3WmyfRLKX+/nygsHOsmHJ2F v5REP76wVkg83AWW0QoRl/sW2QzkQxhunEJbK4cI6+9nm+ZURgcieNeEQ5nfoPanu/dP +M5aV89vmjrO7yUJinZZQ7bXh97TbUYLs4/7nEoiSDCDx93CxI6ZrfchL/tJXfyeEr0O 1Nl6MZgIaYZlE5PH/0g5KNInFC9oKKL7RvGDprix4dYGIeSs0Dv60EnmkE64VXSeo3sN RgxA== X-Gm-Message-State: ALoCoQmF9LO4BqqkSm1vrEBqOvTCJWeY9m39anqHStCnrfZcEd5vOjVMiBWfiH8Ulo9pZhuUS0Iw X-Received: by 10.15.60.199 with SMTP id g47mr59021131eex.37.1395584377011; Sun, 23 Mar 2014 07:19:37 -0700 (PDT) Received: from phenom.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id cb5sm26392589eeb.18.2014.03.23.07.19.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 23 Mar 2014 07:19:36 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Sun, 23 Mar 2014 15:18:52 +0100 Message-Id: <1395584342-11812-19-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1395584342-11812-1-git-send-email-daniel.vetter@ffwll.ch> References: <1395584342-11812-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 18/28] lib: unnecessary header removal for drmtest.h, part 2 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 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.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 I've left unistd.h in it - it's not strictly required but most users of drmtest.h want it for the open helpers, and then you kinda need to close that file descriptor again ... Signed-off-by: Daniel Vetter --- benchmarks/intel_upload_blit_large.c | 6 ++++-- lib/drmtest.h | 9 +++------ lib/igt_core.c | 2 +- lib/igt_core.h | 2 ++ lib/igt_debugfs.c | 1 + lib/igt_kms.c | 6 +++++- lib/igt_kms.h | 2 ++ lib/ioctl_wrappers.c | 1 + tests/core_getclient.c | 3 +++ tests/core_getstats.c | 5 +++++ tests/gem_ctx_bad_destroy.c | 2 ++ tests/gem_ctx_create.c | 2 ++ tests/gem_fenced_exec_thrash.c | 4 +++- tests/gem_flink_race.c | 1 + tests/gem_reg_read.c | 2 ++ tests/gem_seqno_wrap.c | 1 + tests/gem_vmap_blits.c | 1 + tests/igt_simulation.c | 1 + tests/pm_psr.c | 2 ++ tests/pm_rc6_residency.c | 2 ++ tests/pm_rps.c | 1 + tests/prime_udl.c | 3 ++- 22 files changed, 47 insertions(+), 12 deletions(-) diff --git a/benchmarks/intel_upload_blit_large.c b/benchmarks/intel_upload_blit_large.c index b44433f9a30d..40bdbcfb8fe3 100644 --- a/benchmarks/intel_upload_blit_large.c +++ b/benchmarks/intel_upload_blit_large.c @@ -53,8 +53,10 @@ #include #include #include -#include "drm.h" -#include "i915_drm.h" + +#include +#include + #include "drmtest.h" #include "intel_bufmgr.h" #include "intel_batchbuffer.h" diff --git a/lib/drmtest.h b/lib/drmtest.h index 4c55068ee54c..97d60d0c29dd 100644 --- a/lib/drmtest.h +++ b/lib/drmtest.h @@ -28,16 +28,13 @@ #ifndef DRMTEST_H #define DRMTEST_H -#include -#include #include -#include #include +#include #include -#include "xf86drm.h" -#include "xf86drmMode.h" -#include "intel_batchbuffer.h" +#include +#include #ifdef ANDROID #ifndef HAVE_MMAP64 diff --git a/lib/igt_core.c b/lib/igt_core.c index efcc4a11fcc5..81e37313fb45 100644 --- a/lib/igt_core.c +++ b/lib/igt_core.c @@ -48,9 +48,9 @@ #include #include #include +#include #include "drmtest.h" -#include "i915_drm.h" #include "intel_chipset.h" #include "intel_gpu_tools.h" #include "igt_debugfs.h" diff --git a/lib/igt_core.h b/lib/igt_core.h index 47576da652a0..7ede0d37a540 100644 --- a/lib/igt_core.h +++ b/lib/igt_core.h @@ -32,8 +32,10 @@ #include #include +#include #include #include +#include bool __igt_fixture(void); void __igt_fixture_complete(void); diff --git a/lib/igt_debugfs.c b/lib/igt_debugfs.c index f467ce0f3992..96adf396887b 100644 --- a/lib/igt_debugfs.c +++ b/lib/igt_debugfs.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 88ee83be2f91..f74f7070d040 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -23,14 +23,18 @@ */ #define _GNU_SOURCE +#include #include #include #include #include #include +#include #include #include -#include "drm_fourcc.h" +#include + +#include #include "drmtest.h" #include "igt_kms.h" diff --git a/lib/igt_kms.h b/lib/igt_kms.h index d141cfce8504..95735e8ffdd7 100644 --- a/lib/igt_kms.h +++ b/lib/igt_kms.h @@ -29,6 +29,8 @@ #include #include +#include + #include "igt_display.h" struct kmstest_connector_config { diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c index 147334f3286b..5806f2a13bd8 100644 --- a/lib/ioctl_wrappers.c +++ b/lib/ioctl_wrappers.c @@ -47,6 +47,7 @@ #include #include #include +#include #include "drmtest.h" #include "i915_drm.h" diff --git a/tests/core_getclient.c b/tests/core_getclient.c index 22f0ab2e2b69..ed46e51924ea 100644 --- a/tests/core_getclient.c +++ b/tests/core_getclient.c @@ -27,6 +27,9 @@ #include #include +#include +#include + #include "drmtest.h" /** diff --git a/tests/core_getstats.c b/tests/core_getstats.c index cce8271b561d..1e2c5651d5eb 100644 --- a/tests/core_getstats.c +++ b/tests/core_getstats.c @@ -27,6 +27,11 @@ #include #include +#include + +#include + +#include "igt_core.h" #include "drmtest.h" /** diff --git a/tests/gem_ctx_bad_destroy.c b/tests/gem_ctx_bad_destroy.c index 092f34221061..97a706660dc1 100644 --- a/tests/gem_ctx_bad_destroy.c +++ b/tests/gem_ctx_bad_destroy.c @@ -31,6 +31,8 @@ #include #include +#include + #include "ioctl_wrappers.h" #include "drmtest.h" diff --git a/tests/gem_ctx_create.c b/tests/gem_ctx_create.c index f32c2287f8d9..57494fc44638 100644 --- a/tests/gem_ctx_create.c +++ b/tests/gem_ctx_create.c @@ -27,6 +27,8 @@ #include #include +#include + #include "ioctl_wrappers.h" #include "drmtest.h" diff --git a/tests/gem_fenced_exec_thrash.c b/tests/gem_fenced_exec_thrash.c index cd53cafc5fdf..2ba85f2bcb5a 100644 --- a/tests/gem_fenced_exec_thrash.c +++ b/tests/gem_fenced_exec_thrash.c @@ -33,9 +33,11 @@ #include #include #include +#include + #include -#include "ioctl_wrappers.h" +#include "ioctl_wrappers.h" #include "drmtest.h" #include "intel_chipset.h" #include "intel_gpu_tools.h" diff --git a/tests/gem_flink_race.c b/tests/gem_flink_race.c index 26c71cecce07..3353b83e6acd 100644 --- a/tests/gem_flink_race.c +++ b/tests/gem_flink_race.c @@ -31,6 +31,7 @@ #include #include #include +#include #include "drmtest.h" #include "ioctl_wrappers.h" diff --git a/tests/gem_reg_read.c b/tests/gem_reg_read.c index 19f1351b3fd1..b4a6650a64d4 100644 --- a/tests/gem_reg_read.c +++ b/tests/gem_reg_read.c @@ -27,6 +27,8 @@ #include #include +#include + #include "ioctl_wrappers.h" #include "drmtest.h" diff --git a/tests/gem_seqno_wrap.c b/tests/gem_seqno_wrap.c index 19c0201e21ba..30d1a8687090 100644 --- a/tests/gem_seqno_wrap.c +++ b/tests/gem_seqno_wrap.c @@ -41,6 +41,7 @@ #include #include #include +#include #include "ioctl_wrappers.h" #include "drmtest.h" diff --git a/tests/gem_vmap_blits.c b/tests/gem_vmap_blits.c index 4fb2a215e3d5..157d67460e6c 100644 --- a/tests/gem_vmap_blits.c +++ b/tests/gem_vmap_blits.c @@ -43,6 +43,7 @@ #include #include #include + #include "drm.h" #include "ioctl_wrappers.h" #include "drmtest.h" diff --git a/tests/igt_simulation.c b/tests/igt_simulation.c index f4007b80929e..d3331176cf2c 100644 --- a/tests/igt_simulation.c +++ b/tests/igt_simulation.c @@ -29,6 +29,7 @@ #include #include #include +#include #include "drmtest.h" #include "igt_core.h" diff --git a/tests/pm_psr.c b/tests/pm_psr.c index 5d28c7a59a3b..4ba121f10a38 100644 --- a/tests/pm_psr.c +++ b/tests/pm_psr.c @@ -29,6 +29,8 @@ #include #include #include +#include + #include "drmtest.h" #define SLEEP_DURATION 5000 // in milliseconds diff --git a/tests/pm_rc6_residency.c b/tests/pm_rc6_residency.c index 3fd9d47e9db3..84eb8a909019 100644 --- a/tests/pm_rc6_residency.c +++ b/tests/pm_rc6_residency.c @@ -30,6 +30,8 @@ #include #include #include +#include + #include "drmtest.h" #define SLEEP_DURATION 3000 // in milliseconds diff --git a/tests/pm_rps.c b/tests/pm_rps.c index e6ab37907e8e..1f4b284cd42a 100644 --- a/tests/pm_rps.c +++ b/tests/pm_rps.c @@ -34,6 +34,7 @@ #include #include #include +#include #include "drmtest.h" #include "intel_gpu_tools.h" diff --git a/tests/prime_udl.c b/tests/prime_udl.c index 892a952795a7..96661fcb501f 100644 --- a/tests/prime_udl.c +++ b/tests/prime_udl.c @@ -24,7 +24,8 @@ #include #include "xf86drm.h" -#include "xf86drmMode.h" +#include + #include "ioctl_wrappers.h" #include "intel_bufmgr.h" #include "intel_gpu_tools.h"