[Intel-gfx] [PATCH] intel: Merge i915_drm.h with cmd parser define

[Volkin, Bradley D]

On Wed, Jan 29, 2014 at 02:13:21PM -0800, Chris Wilson wrote:
> On Wed, Jan 29, 2014 at 01:57:28PM -0800, bradley.d.volkin at intel.com wrote:
> > From: Brad Volkin <bradley.d.volkin at intel.com>
> > 
> > Signed-off-by: Brad Volkin <bradley.d.volkin at intel.com>
> > ---
> >  include/drm/i915_drm.h | 5 +++--
> >  1 file changed, 3 insertions(+), 2 deletions(-)
> > 
> > diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
> > index 2f4eb8c..ba863c4 100644
> > --- a/include/drm/i915_drm.h
> > +++ b/include/drm/i915_drm.h
> > @@ -27,7 +27,7 @@
> >  #ifndef _I915_DRM_H_
> >  #define _I915_DRM_H_
> >  
> > -#include <drm.h>
> > +#include <drm/drm.h>
> 
> Something about this patch smells very fishy....

Yeah, I wasn't completely sure about this one. I followed what I thought was
the procedure for updating the header (i.e. make headers_install in kernel,
copy to libdrm) and this is what I got.
-Brad

> 
> >  
> >  /* Please note that modifications to all structs defined here are
> >   * subject to backwards-compatibility constraints.
> > @@ -337,6 +337,7 @@ typedef struct drm_i915_irq_wait {
> >  #define I915_PARAM_HAS_EXEC_NO_RELOC	 25
> >  #define I915_PARAM_HAS_EXEC_HANDLE_LUT   26
> >  #define I915_PARAM_HAS_WT     	 	 27
> > +#define I915_PARAM_CMD_PARSER_VERSION	 28
> >  
> >  typedef struct drm_i915_getparam {
> >  	int param;
> > @@ -721,7 +722,7 @@ struct drm_i915_gem_execbuffer2 {
> >   */
> >  #define I915_EXEC_IS_PINNED		(1<<10)
> >  
> > -/** Provide a hint to the kernel that the command stream and auxilliary
> > +/** Provide a hint to the kernel that the command stream and auxiliary
> >   * state buffers already holds the correct presumed addresses and so the
> >   * relocation process may be skipped if no buffers need to be moved in
> >   * preparation for the execbuffer.
> 
> -- 
> Chris Wilson, Intel Open Source Technology Centre