From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [PATCH] intel: Merge i915_drm.h with cmd parser
 define
Date: Thu, 30 Jan 2014 10:20:57 +0100
Message-ID: <20140130092056.GM17001@phenom.ffwll.local>
References: <1385484699-51596-1-git-send-email-bradley.d.volkin@intel.com>
	<1391032648-19227-1-git-send-email-bradley.d.volkin@intel.com>
	<20140129221321.GM28110@nuc-i3427.alporthouse.com>
	<20140129222612.GB19431@vpg-ubuntu-bdvolkin>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mail-ea0-f170.google.com (mail-ea0-f170.google.com
	[209.85.215.170])
	by gabe.freedesktop.org (Postfix) with ESMTP id 7AE33FAA42
	for <intel-gfx@lists.freedesktop.org>;
	Thu, 30 Jan 2014 01:21:01 -0800 (PST)
Received: by mail-ea0-f170.google.com with SMTP id k10so1473951eaj.15
	for <intel-gfx@lists.freedesktop.org>;
	Thu, 30 Jan 2014 01:21:00 -0800 (PST)
Content-Disposition: inline
In-Reply-To: <20140129222612.GB19431@vpg-ubuntu-bdvolkin>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Sender: intel-gfx-bounces@lists.freedesktop.org
Errors-To: intel-gfx-bounces@lists.freedesktop.org
To: "Volkin, Bradley D" <bradley.d.volkin@intel.com>
Cc: "intel-gfx@lists.freedesktop.org" <intel-gfx@lists.freedesktop.org>
List-Id: intel-gfx@lists.freedesktop.org

On Wed, Jan 29, 2014 at 02:26:12PM -0800, Volkin, Bradley D wrote:
> 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@intel.com wrote:
> > > From: Brad Volkin <bradley.d.volkin@intel.com>
> > > 
> > > Signed-off-by: Brad Volkin <bradley.d.volkin@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.

I guess either works, so maybe just add a note to the commit message about
the little change. Imo it's better to have a 1:1 copy of the header
generated by the kernel.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch