[Intel-gfx] [PATCH v3.1 06/20] drm/i915: Remove plane_config from struct intel_crtc, v2.

[Daniel Vetter]

On Tue, Jul 14, 2015 at 12:33:29PM +0200, Maarten Lankhorst wrote:
> commit 4efb477b56ca9ac6ab76136a2801aaee4d3f46c5
> Author: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Date:   Mon Jul 13 15:29:47 2015 +0200
> 
>     drm/i915: Remove plane_config from struct intel_crtc, v2.
>     
>     Nothing depends on this outside initial hw readout, so keep this
>     struct on the stack instead.
>     
>     Changes since v1:
>     - Remove unrelated changes.
>     
>     Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
>     Reviewed-by: Daniel Stone <daniels at collabora.com>

Merged up to this one (with the strange indent removed).

Thanks, Daniel

> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 6432c180725f..0ca2b1df7e03 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -15206,6 +15206,8 @@ void intel_modeset_init(struct drm_device *dev)
>  	drm_modeset_unlock_all(dev);
>  
>  	for_each_intel_crtc(dev, crtc) {
> +		struct intel_initial_plane_config plane_config = {};
> +
>  		if (!crtc->active)
>  			continue;
>  
> @@ -15216,15 +15218,14 @@ void intel_modeset_init(struct drm_device *dev)
>  		 * can even allow for smooth boot transitions if the BIOS
>  		 * fb is large enough for the active pipe configuration.
>  		 */
> -		if (dev_priv->display.get_initial_plane_config) {
> -			dev_priv->display.get_initial_plane_config(crtc,
> -							   &crtc->plane_config);
> -			/*
> -			 * If the fb is shared between multiple heads, we'll
> -			 * just get the first one.
> -			 */
> -			intel_find_initial_plane_obj(crtc, &crtc->plane_config);
> -		}
> +		dev_priv->display.get_initial_plane_config(crtc,
> +							   &plane_config);
> +
> +		/*
> +		 * If the fb is shared between multiple heads, we'll
> +		 * just get the first one.
> +		 */
> +		intel_find_initial_plane_obj(crtc, &plane_config);
>  	}
>  }
>  
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 09a0a9222a3a..09e3581c8441 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -550,7 +550,6 @@ struct intel_crtc {
>  	uint32_t cursor_size;
>  	uint32_t cursor_base;
>  
> -	struct intel_initial_plane_config plane_config;
>  	struct intel_crtc_state *config;
>  	bool new_enabled;
>  
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch