[Intel-gfx] [PATCH 1/6] drm/i915: read out hw state earlier v2

[Daniel Vetter]

On Tue, Feb 11, 2014 at 03:28:56PM -0800, Jesse Barnes wrote:
> We want to do this early on before we try to fetch the plane config,
> which depends on some of the pipe config state.

I think the crucial step here is actually the gem setup, more specifically
the stolen setup. If we don't do the fb reconstruction before that we
can't pre-reserve the space any more. I'll amend the commit message.
-Daniel

> 
> v2: split back out from get_plane_config change (Daniel)
>     update for recent locking & reset changes (Jesse)
> 
> Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
> ---
>  drivers/gpu/drm/i915/intel_display.c |    6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 0df974b..cecb2c9 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -11072,6 +11072,8 @@ void intel_modeset_init(struct drm_device *dev)
>  
>  	/* Just in case the BIOS is doing something questionable. */
>  	intel_disable_fbc(dev);
> +
> +	intel_modeset_setup_hw_state(dev, false);
>  }
>  
>  static void
> @@ -11439,10 +11441,6 @@ void intel_modeset_gem_init(struct drm_device *dev)
>  	intel_modeset_init_hw(dev);
>  
>  	intel_setup_overlay(dev);
> -
> -	mutex_lock(&dev->mode_config.mutex);
> -	intel_modeset_setup_hw_state(dev, false);
> -	mutex_unlock(&dev->mode_config.mutex);
>  }
>  
>  void intel_modeset_cleanup(struct drm_device *dev)
> -- 
> 1.7.9.5
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch