On 15 June 2017 at 13:46, Lionel Landwerlin <lionel.g.landwer...@intel.com> wrote:
> --- a/src/intel/Makefile.vulkan.am > +++ b/src/intel/Makefile.vulkan.am > @@ -84,13 +84,13 @@ VULKAN_CFLAGS = \ > VULKAN_CPPFLAGS = \ > -I$(top_srcdir)/src/compiler \ > -I$(top_srcdir)/src/intel/compiler \ > + -I$(top_srcdir)/src/intel/drm \ > -I$(top_builddir)/src/intel/vulkan \ > -I$(top_srcdir)/src/intel/vulkan \ > -I$(top_srcdir)/src/vulkan/wsi \ > -I$(top_builddir)/src/vulkan/util \ > -I$(top_srcdir)/src/vulkan/util \ > - $(AM_CPPFLAGS) \ > - $(LIBDRM_CFLAGS) > + $(AM_CPPFLAGS) I doubt you can remove this (and below), since one relies on it for xf86drm.h, even through the header currently lives in /usr/include. Sincere apologies for missing it :-\ > > vulkan_libanv_gen7_la_CFLAGS = $(VULKAN_CFLAGS) > vulkan_libanv_gen7_la_CPPFLAGS = $(VULKAN_CPPFLAGS) -DGEN_VERSIONx10=70 > diff --git a/src/intel/drm/README b/src/intel/drm/README > new file mode 100644 > index 00000000000..f55381799e5 > --- /dev/null > +++ b/src/intel/drm/README > @@ -0,0 +1,17 @@ > +This directory contains a copy of the installed kernel headers > +required by the anv & i965 drivers to communicate with the kernel. > +Whenever either of those driver needs new definitions for new kernel > +APIs, these files should be updated. > + > +You can copy files installed after running this from the kernel > +repository, at version the drivers require : > + > +$ make headers_install INSTALL_HDR_PATH=/path/to/install > + > +The last update was done at the following kernel commit : > + > +commit cafd1e4df1e6e039268c4e4b1a55c88915d21f2e > +Author: Rodrigo Vivi <rodrigo.v...@intel.com> > +Date: Wed Jun 14 12:56:57 2017 -0700 > + > + drm-tip: 2017y-06m-14d-19h-56m-24s UTC integration manifest Please double-check with DanielV that pulling the headers from drm-tip is a wise move. Using nightly trees was a serious no-go previously, yet things may have changed. > diff --git a/src/mesa/drivers/dri/i965/Makefile.am > b/src/mesa/drivers/dri/i965/Makefile.am > index c29cc594c8e..9cdf21ca42d 100644 > --- a/src/mesa/drivers/dri/i965/Makefile.am > +++ b/src/mesa/drivers/dri/i965/Makefile.am > @@ -38,9 +38,9 @@ AM_CFLAGS = \ > -I$(top_srcdir)/src/compiler/nir \ > -I$(top_builddir)/src/intel \ > -I$(top_srcdir)/src/intel \ > + -I$(top_srcdir)/src/intel/drm \ > $(DEFINES) \ > $(VISIBILITY_CFLAGS) \ > - $(LIBDRM_CFLAGS) \ ... and here. With the two nits (don't bother resending) this looks fine from build POV and is Reviewed-by: Emil Velikov <emil.veli...@collabora.com> Please check with Daniel on the drm-tip topic before pushing. -Emil _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
