| Message ID | 1352868399-6552-1-git-send-email-haihao.xiang@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Nov 14, 2012 at 12:46:38PM +0800, Xiang, Haihao wrote: > From: Zhao Yakui <yakui.zhao@intel.com> > > Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> Fyi the best way is to simply run $ make headers_install in the latest kernel tree and copy the resulting userspace header from usr/include/drm/i915_drm.h to libdrm. Otherwise things tend to get out of sync. In the commit message you can then mention up to which kernel commit you've synced. -Daniel > --- > include/drm/i915_drm.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h > index 7e9e9bd..8b069ac 100644 > --- a/include/drm/i915_drm.h > +++ b/include/drm/i915_drm.h > @@ -303,6 +303,8 @@ typedef struct drm_i915_irq_wait { > #define I915_PARAM_HAS_LLC 17 > #define I915_PARAM_HAS_ALIASING_PPGTT 18 > #define I915_PARAM_HAS_WAIT_TIMEOUT 19 > +#define I915_PARAM_HAS_SEMAPHORES 20 > +#define I915_PARAM_HAS_PRIME_VMAP_FLUSH 21 > > typedef struct drm_i915_getparam { > int param; > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Thu, 2012-11-15 at 12:30 +0100, Daniel Vetter wrote: > On Wed, Nov 14, 2012 at 12:46:38PM +0800, Xiang, Haihao wrote: > > From: Zhao Yakui <yakui.zhao@intel.com> > > > > Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> > > Fyi the best way is to simply run > > $ make headers_install > > in the latest kernel tree and copy the resulting userspace header from > usr/include/drm/i915_drm.h to libdrm. Otherwise things tend to get out of > sync. In the commit message you can then mention up to which kernel commit > you've synced. > -Daniel Thanks for your comment. But it will bring some changes to the existent data structures by this way, such as -struct drm_i915_gem_cacheing { +struct drm_i915_gem_caching { Is this what we want ? Thanks Haihao > > > --- > > include/drm/i915_drm.h | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h > > index 7e9e9bd..8b069ac 100644 > > --- a/include/drm/i915_drm.h > > +++ b/include/drm/i915_drm.h > > @@ -303,6 +303,8 @@ typedef struct drm_i915_irq_wait { > > #define I915_PARAM_HAS_LLC 17 > > #define I915_PARAM_HAS_ALIASING_PPGTT 18 > > #define I915_PARAM_HAS_WAIT_TIMEOUT 19 > > +#define I915_PARAM_HAS_SEMAPHORES 20 > > +#define I915_PARAM_HAS_PRIME_VMAP_FLUSH 21 > > > > typedef struct drm_i915_getparam { > > int param; > > -- > > 1.7.9.5 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx >
On Fri, Nov 16, 2012 at 2:52 AM, Xiang, Haihao <haihao.xiang@intel.com> wrote: > On Thu, 2012-11-15 at 12:30 +0100, Daniel Vetter wrote: >> On Wed, Nov 14, 2012 at 12:46:38PM +0800, Xiang, Haihao wrote: >> > From: Zhao Yakui <yakui.zhao@intel.com> >> > >> > Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> >> >> Fyi the best way is to simply run >> >> $ make headers_install >> >> in the latest kernel tree and copy the resulting userspace header from >> usr/include/drm/i915_drm.h to libdrm. Otherwise things tend to get out of >> sync. In the commit message you can then mention up to which kernel commit >> you've synced. >> -Daniel > > > Thanks for your comment. But it will bring some changes to the existent > data structures by this way, such as > > -struct drm_i915_gem_cacheing { > +struct drm_i915_gem_caching { > > Is this what we want ? Presuming it doesn't change any of the exposed libdrm interfaces, yes this is what we want - the kernel and libdrm i915_drm.h file should be in sync. In this specific case we've decided that the mispelling is too awful to be allowed to live on ;-) -Daniel
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h index 7e9e9bd..8b069ac 100644 --- a/include/drm/i915_drm.h +++ b/include/drm/i915_drm.h @@ -303,6 +303,8 @@ typedef struct drm_i915_irq_wait { #define I915_PARAM_HAS_LLC 17 #define I915_PARAM_HAS_ALIASING_PPGTT 18 #define I915_PARAM_HAS_WAIT_TIMEOUT 19 +#define I915_PARAM_HAS_SEMAPHORES 20 +#define I915_PARAM_HAS_PRIME_VMAP_FLUSH 21 typedef struct drm_i915_getparam { int param;