| Message ID | 20171206231123.22380-1-scott.d.phillips@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> On 2017-12-06 15:11:20, Scott D Phillips wrote: > 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 <scott.d.phillips@intel.com> > --- > 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 <intel_aub.h> > +#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 <intel_aub.h> > +#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. > -- > 2.14.3 >
Series: Tested-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> On 2017-12-06 15:11:20, Scott D Phillips wrote: > 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 <scott.d.phillips@intel.com> > --- > 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 <intel_aub.h> > +#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 <intel_aub.h> > +#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. > -- > 2.14.3 >
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 <intel_aub.h> +#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 <intel_aub.h> +#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.
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 <scott.d.phillips@intel.com> --- 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%)