drm/i915: adjust get_crtc_fence_y_offset() to use base.y instead of crtc.y

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@gmail.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1508270891-22186-6-git-send-email-juhapekka.heikkila@gmail.com

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 835e2d27581e0f010e0765a702e59085599fff19..f01c80076c59cbd3ec891f125ff662ffbfa39bdd 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1116,6 +1116,8 @@ struct intel_fbc {
                         */
                        int adjusted_x;
                        int adjusted_y;
+
+                       int y;
                } plane;
 
                struct {

diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c
index 0ee65be50f1896d24d6ecc58288f62d596fb9e20..1a0f5e0c8d1056801074732bc2243c48632d05e2 100644 (file)
--- a/drivers/gpu/drm/i915/intel_fbc.c
+++ b/drivers/gpu/drm/i915/intel_fbc.c
@@ -69,12 +69,9 @@ 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.y - fbc->state_cache.plane.adjusted_y;
 }
 
 /*
@@ -762,6 +759,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.y = plane_state->base.src.y1 >> 16;
 
        if (!cache->plane.visible)
                return;
@@ -893,7 +891,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;