[Intel-gfx] [PATCH 5/5] drm/i915: adjust get_crtc_fence_y_offset() to use base.y instead of crtc.y

[Ville Syrjälä]

On Tue, Sep 19, 2017 at 10:44:09PM +0300, Juha-Pekka Heikkila wrote:
> This is to use clipped y coordinate here. I left get_crtc_fence_y_offset()
> function itself in place as oneliner to maintain comment above it why this
> is done.
> 
> Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.h  |  2 ++
>  drivers/gpu/drm/i915/intel_fbc.c | 11 +++++------
>  2 files changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 17960ba..f7c1162 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1103,6 +1103,8 @@ struct intel_fbc {
>  			 */
>  			int adjusted_x;
>  			int adjusted_y;
> +
> +			int base_y;

Calling it 'base_y' doesn't really make sense to me.
I think you could just call it 'y'.

>  		} plane;
>  
>  		struct {
> diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c
> index dc059808..a65af80 100644
> --- a/drivers/gpu/drm/i915/intel_fbc.c
> +++ b/drivers/gpu/drm/i915/intel_fbc.c
> @@ -69,12 +69,10 @@ static inline bool no_fbc_on_multiple_pipes(struct drm_i915_private *dev_priv)
>   * address we program because it starts at the real start of the buffer, so we
>   * have to take this into consideration here.
>   */
> -static unsigned int get_crtc_fence_y_offset(struct intel_crtc *crtc)
> +static unsigned int get_crtc_fence_y_offset(struct intel_fbc *fbc)
>  {
> -	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> -	struct intel_fbc *fbc = &dev_priv->fbc;
> -
> -	return crtc->base.y - fbc->state_cache.plane.adjusted_y;
> +	return fbc->state_cache.plane.base_y
> +			- fbc->state_cache.plane.adjusted_y;
>  }
>  
>  /*
> @@ -762,6 +760,7 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc,
>  	cache->plane.visible = plane_state->base.visible;
>  	cache->plane.adjusted_x = plane_state->main.x;
>  	cache->plane.adjusted_y = plane_state->main.y;
> +	cache->plane.base_y = plane_state->base.src.y1 >> 16;
>  
>  	if (!cache->plane.visible)
>  		return;
> @@ -893,7 +892,7 @@ static void intel_fbc_get_reg_params(struct intel_crtc *crtc,
>  
>  	params->crtc.pipe = crtc->pipe;
>  	params->crtc.plane = crtc->plane;
> -	params->crtc.fence_y_offset = get_crtc_fence_y_offset(crtc);
> +	params->crtc.fence_y_offset = get_crtc_fence_y_offset(fbc);
>  
>  	params->fb.format = cache->fb.format;
>  	params->fb.stride = cache->fb.stride;
> -- 
> 2.7.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC