[Intel-gfx] [PATCH 3/4] drm/i915: Include i915_reg.h in intel_ringbuffer.h

Chris Wilson chris at chris-wilson.co.uk
Wed Mar 7 12:06:57 UTC 2018


Quoting Chris Wilson (2018-03-07 11:47:15)
> Quoting Michal Wajdeczko (2018-03-07 11:24:06)
> > On Wed, 07 Mar 2018 08:58:30 +0100, Tvrtko Ursulin  
> > <tvrtko.ursulin at linux.intel.com> wrote:
> > 
> > >
> > > On 06/03/2018 17:33, Chris Wilson wrote:
> > >> Quoting Michal Wajdeczko (2018-03-06 16:15:26)
> > >>> Header intel_ringbuffer.h is using definitions from i915_reg.h
> > >>> but forget to include it. Remove this hidden dependency by
> > >>> explicitly include missing header.
> > >>>
> > >>> Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
> > >>> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> > >>> Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> > >>> ---
> > >>>   drivers/gpu/drm/i915/intel_ringbuffer.h | 1 +
> > >>>   1 file changed, 1 insertion(+)
> > >>>
> > >>> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h  
> > >>> b/drivers/gpu/drm/i915/intel_ringbuffer.h
> > >>> index e7526a4..cdea2ab 100644
> > >>> --- a/drivers/gpu/drm/i915/intel_ringbuffer.h
> > >>> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
> > >>> @@ -7,6 +7,7 @@
> > >>>   #include "i915_gem_batch_pool.h"
> > >>>   #include "i915_gem_timeline.h"
> > >>>   +#include "i915_reg.h"
> > >>  Just the gpu commands, right? I'd like to pull those out of i915_reg.h!
> > >
> > > The one I spotted by luck was VECS_HW. Maybe Michal has a more  
> > > comprehensive list as output by the compiler when he found the problem.
> > >
> > 
> > We need i915_reg_t itself and VECS_HW plus gpu commands.
> > So, what kind of reminder do you want me to add?
> 
> #include "i915_reg.h" /* FIXME split out i915_gpu_commands.h */
> (commands, instructions? instructions is too close EU IA?) ?

And should be intel_gpu_commands.h, if I were to follow the guide
consistently :)
-Chris


More information about the Intel-gfx mailing list