From patchwork Wed Dec 6 23:11:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott D Phillips X-Patchwork-Id: 10097389 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 05E3160329 for ; Wed, 6 Dec 2017 23:12:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC8E729ECE for ; Wed, 6 Dec 2017 23:12:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E158B29ED3; Wed, 6 Dec 2017 23:12:45 +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 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 6D7F529ECE for ; Wed, 6 Dec 2017 23:12:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0B32289C6A; Wed, 6 Dec 2017 23:12:45 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id F0BE589C6A for ; Wed, 6 Dec 2017 23:12:43 +0000 (UTC) Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Dec 2017 15:12:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,369,1508828400"; d="scan'208";a="697968" Received: from dsp-dsk1.jf.intel.com ([10.7.199.59]) by orsmga008.jf.intel.com with ESMTP; 06 Dec 2017 15:12:42 -0800 From: Scott D Phillips To: intel-gfx@lists.freedesktop.org Date: Wed, 6 Dec 2017 15:11:20 -0800 Message-Id: <20171206231123.22380-1-scott.d.phillips@intel.com> X-Mailer: git-send-email 2.14.3 Cc: Benjamin Widawsky Subject: [Intel-gfx] [PATCH i-g-t 1/4] lib: copy intel_aub.h from libdrm 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 No functionality related to aub is provided by libdrm aside from intel_aub.h which somewhat defines the file format. Move the header into this project to ease aub-related development. Signed-off-by: Scott D Phillips Reviewed-by: Jordan Justen Tested-by: Jordan Justen Reviewed-by: Jordan Justen --- lib/Makefile.am | 1 - lib/{stubs/drm => }/intel_aub.h | 0 lib/rendercopy_gen8.c | 2 +- lib/rendercopy_gen9.c | 2 +- lib/stubs/drm/README | 6 +++--- 5 files changed, 5 insertions(+), 6 deletions(-) rename lib/{stubs/drm => }/intel_aub.h (100%) diff --git a/lib/Makefile.am b/lib/Makefile.am index c19055ac..ab9eefe6 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -23,7 +23,6 @@ endif if !HAVE_LIBDRM_INTEL libintel_tools_la_SOURCES += \ - stubs/drm/intel_aub.h \ stubs/drm/intel_bufmgr.c \ stubs/drm/intel_bufmgr.h endif diff --git a/lib/stubs/drm/intel_aub.h b/lib/intel_aub.h similarity index 100% rename from lib/stubs/drm/intel_aub.h rename to lib/intel_aub.h diff --git a/lib/rendercopy_gen8.c b/lib/rendercopy_gen8.c index a7fc2c48..fe3fedfa 100644 --- a/lib/rendercopy_gen8.c +++ b/lib/rendercopy_gen8.c @@ -22,7 +22,7 @@ #include "intel_reg.h" #include "igt_aux.h" -#include +#include "intel_aub.h" #define VERTEX_SIZE (3*4) diff --git a/lib/rendercopy_gen9.c b/lib/rendercopy_gen9.c index 95374807..e646e97f 100644 --- a/lib/rendercopy_gen9.c +++ b/lib/rendercopy_gen9.c @@ -23,7 +23,7 @@ #include "intel_reg.h" #include "igt_aux.h" -#include +#include "intel_aub.h" #define VERTEX_SIZE (3*4) diff --git a/lib/stubs/drm/README b/lib/stubs/drm/README index 118837c3..79f2b5f6 100644 --- a/lib/stubs/drm/README +++ b/lib/stubs/drm/README @@ -1,4 +1,4 @@ -intel_bufmgr.h and intel_aub.h are a local copy of the files provided by libdrm. +intel_bufmgr.h is a local copy of the file provided by libdrm (intel/intel_bufmgr.h). -Before releasing i-g-t a current copy of the files should be copied into this -directory of i-g-t. +Before releasing i-g-t a current copy of intel_bufmgr.h should be copied into +this directory of i-g-t.