[Intel-gfx] [PATCH v3 07/19] drm/i915: Move load time gem_load_init earlier

[Imre Deak]

On Wed, 2016-03-16 at 11:57 +0000, Chris Wilson wrote:
> On Wed, Mar 16, 2016 at 01:38:56PM +0200, Imre Deak wrote:
> > The only steps requiring device access is the fence and swizzling
> > initialization, so split these out keeping them in their current
> > place
> > and move the rest of init steps earlier.
> > 
> > Signed-off-by: Imre Deak <imre.deak at intel.com>
> > ---
> >  drivers/gpu/drm/i915/i915_dma.c | 13 ++++++++-----
> >  drivers/gpu/drm/i915/i915_drv.h |  1 +
> >  drivers/gpu/drm/i915/i915_gem.c | 34 ++++++++++++++++++++---------
> > -----
> >  3 files changed, 29 insertions(+), 19 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_dma.c
> > b/drivers/gpu/drm/i915/i915_dma.c
> > index da96ccd..9ada500 100644
> > --- a/drivers/gpu/drm/i915/i915_dma.c
> > +++ b/drivers/gpu/drm/i915/i915_dma.c
> > @@ -1031,6 +1031,7 @@ int i915_driver_load(struct drm_device *dev,
> > unsigned long flags)
> >  	intel_init_display_hooks(dev_priv);
> >  	intel_init_clock_gating_hooks(dev_priv);
> >  	intel_init_audio_hooks(dev_priv);
> > +	i915_gem_load_init(dev);
> >  
> >  	intel_runtime_pm_get(dev_priv);
> >  
> > @@ -1114,7 +1115,9 @@ int i915_driver_load(struct drm_device *dev,
> > unsigned long flags)
> >  
> >  	intel_opregion_setup(dev);
> >  
> > -	i915_gem_load_init(dev);
> > +	i915_gem_load_init_fences(dev_priv);
> > +	i915_gem_detect_bit_6_swizzle(dev);
> 
> Pedant in me would say we want to detect the hw fence capabilties
> first.
> Just move i915_gem_detect_bit_6_swizzle() into init_fences since they
> are semantically related.

Ok.

--Imre