[Intel-gfx] [RFC 5/8] drm/i915: Move active watermarks into CRTC state

[Maarten Lankhorst]

Op 02-07-15 om 04:25 schreef Matt Roper:
> Since we allocate a few CRTC states on the stack, also switch the 'wm'
> struct here to be a union so that we're not wasting stack space with
> other platforms' watermark values.
>
> Signed-off-by: Matt Roper <matthew.d.roper at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_display.c |  8 ++++--
>  drivers/gpu/drm/i915/intel_drv.h     | 54 +++++++++++++++++++-----------------
>  drivers/gpu/drm/i915/intel_pm.c      | 34 ++++++++++++++---------
>  3 files changed, 55 insertions(+), 41 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 46ef981..36ae3f7 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -4733,6 +4733,7 @@ intel_pre_disable_primary(struct drm_crtc *crtc)
>  static void intel_post_plane_update(struct intel_crtc *crtc)
>  {
>  	struct intel_crtc_atomic_commit *atomic = &crtc->atomic;
> +	struct intel_crtc_state *cstate = to_intel_crtc_state(crtc->base.state);
>  	struct drm_device *dev = crtc->base.dev;
>  	struct drm_plane *plane;
>  
> @@ -4742,7 +4743,7 @@ static void intel_post_plane_update(struct intel_crtc *crtc)
>  	intel_frontbuffer_flip(dev, atomic->fb_bits);
>  
>  	if (atomic->disable_cxsr)
> -		crtc->wm.cxsr_allowed = true;
> +		cstate->wm.cxsr_allowed = true;
I'm not sure that keeping cxsr_allowed in crtc_state makes much sense..

Seems like cxsr_allowed should be removed in 8/8 or before?

~Maarten