From patchwork Thu Oct 27 09:38:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 9399131 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 88FE860588 for ; Thu, 27 Oct 2016 09:38:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 736C12A0C9 for ; Thu, 27 Oct 2016 09:38:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 64F322A0F2; Thu, 27 Oct 2016 09:38:56 +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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 2006B2A0C9 for ; Thu, 27 Oct 2016 09:38:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 790666EA2E; Thu, 27 Oct 2016 09:38:49 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 468FA6EA29 for ; Thu, 27 Oct 2016 09:38:47 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id c17so1741400wmc.3 for ; Thu, 27 Oct 2016 02:38:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7iaqCJLrfTVR6gwvxDE6rxhQ1LhCODhy4F+7Z3Rmrro=; b=VpV2yOhHRGP8sUSB512JwVsxNJj0db0YepcMBXSEFa4VAMazVmUclJia0fkjZkW7GX ZSEbhrMlutdT+xupBRcZlVZZaqS712cDlqYVYdYKsoIBaHDrsIbfbH4TP2a5PktIbyzn AfgFqSY/6CAdnlToaMmo1WCDxQrYMzR4AJumu9qPb/Oi1pqD7QdmKqx2gzB9/dgu/H7v tX8tv5SeglqwBj1g0keSA16PloLu7kGyKt7fwdyNXUysxBto3oeyYyfYTHky77G/3mrz NVC9g/w66KfGvNCudJyUVBqjhEtap2Y99Wz7rfcKOYDsY73atHFwsyxiehipcpW2QW7I pXNg== 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=7iaqCJLrfTVR6gwvxDE6rxhQ1LhCODhy4F+7Z3Rmrro=; b=hZHJUxcAOw643naGjHvRxYkAsHRqiM9QUQ6mOFRjHr0e3aeZF6WJLhTeFzTRyYSNWA 1wKZqMPvsFazGF9DT7C8RT7yBP7IUwqsRXNxcLO6CTysAJVV5zqJCeDWirKP/wU3fyih 0/1d7J0dY15RvI0VydIUPpWqsSBg1F982i0V9HtRVuX/ljYEosmCIIKUYdDtpfH/Eh7z eNf1AHCC735VHrq9I68x1mGerNsp/kkjp2+OVETEywuO2lvM5232hL0N5EAcEDm3KXXO 06nBXsf0+hPYOJydhhr1n/eXeFgNavQy2rrfSGHF/9/Fe/g9xEiaQRU1ux3Lx9zMcRup vmrw== X-Gm-Message-State: ABUngvfmDaGh1gxNYloOUyRMG4uJGimalfKvZIp8S+i1AmmSlIgK5Z1phJvl1O9PvJ/CsQ== X-Received: by 10.194.176.6 with SMTP id ce6mr6926521wjc.43.1477561125877; Thu, 27 Oct 2016 02:38:45 -0700 (PDT) Received: from arch-x220.cbg.collabora.co.uk ([2a00:1098:5:0:120b:a9ff:fe8d:c914]) by smtp.gmail.com with ESMTPSA id a1sm7413352wjl.28.2016.10.27.02.38.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Oct 2016 02:38:45 -0700 (PDT) From: Emil Velikov To: intel-gfx@lists.freedesktop.org Date: Thu, 27 Oct 2016 10:38:38 +0100 Message-Id: <20161027093838.26125-1-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161026164839.22880-1-emil.l.velikov@gmail.com> References: <20161026164839.22880-1-emil.l.velikov@gmail.com> Subject: [Intel-gfx] [PATCH i-g-t v2] lib: use the local intel_aub.h file 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: Emil Velikov File is provided by the libdrm_intel package which is optional. Since we already have a local copy of the file, we might as well use it ;-) v2: Move the file alongside intel_bufmgr.h and use it in the disable-intel case. Cc: Brian Starkey Reported-by: Brian Starkey Signed-off-by: Emil Velikov Tested-by: Brian Starkey --- lib/stubs/drm/README | 6 +++--- {tools => lib/stubs/drm}/intel_aub.h | 0 tools/Makefile.am | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename {tools => lib/stubs/drm}/intel_aub.h (100%) diff --git a/lib/stubs/drm/README b/lib/stubs/drm/README index 79f2b5f..118837c 100644 --- a/lib/stubs/drm/README +++ b/lib/stubs/drm/README @@ -1,4 +1,4 @@ -intel_bufmgr.h is a local copy of the file provided by libdrm (intel/intel_bufmgr.h). +intel_bufmgr.h and intel_aub.h are a local copy of the files provided by libdrm. -Before releasing i-g-t a current copy of intel_bufmgr.h should be copied into -this directory of i-g-t. +Before releasing i-g-t a current copy of the files should be copied into this +directory of i-g-t. diff --git a/tools/intel_aub.h b/lib/stubs/drm/intel_aub.h similarity index 100% rename from tools/intel_aub.h rename to lib/stubs/drm/intel_aub.h diff --git a/tools/Makefile.am b/tools/Makefile.am index 11ec2db..18f86f6 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -22,7 +22,7 @@ AM_LDFLAGS = -Wl,--as-needed module_LTLIBRARIES = intel_aubdump.la moduledir = $(libdir) intel_aubdump_la_LDFLAGS = -module -avoid-version -no-undefined -intel_aubdump_la_SOURCES = aubdump.c intel_aub.h +intel_aubdump_la_SOURCES = aubdump.c intel_aubdump_la_LIBADD = $(top_builddir)/lib/libintel_tools.la -ldl bin_SCRIPTS = intel_aubdump