drm/i915: move adjusted_x/y from crtc to cache.

Move adjusted_x/y from crtc to fbc cache.

Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1508270891-22186-2-git-send-email-juhapekka.heikkila@gmail.com
[vsyrjala: Add rudimentary commit message]
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index d31addb..835e2d2 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1108,6 +1108,14 @@ struct intel_fbc {
                        int src_w;
                        int src_h;
                        bool visible;
+                       /*
+                        * Display surface base address adjustement for
+                        * pageflips. Note that on gen4+ this only adjusts up
+                        * to a tile, offsets within a tile are handled in
+                        * the hw itself (with the TILEOFF register).
+                        */
+                       int adjusted_x;
+                       int adjusted_y;
                } plane;
 
                struct {

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 17a9a57..ccbc7ff 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3306,9 +3306,6 @@ static void i9xx_update_primary_plane(struct intel_plane *primary,
        else
                crtc->dspaddr_offset = linear_offset;
 
-       crtc->adjusted_x = x;
-       crtc->adjusted_y = y;
-
        spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
 
        if (INTEL_GEN(dev_priv) < 4) {
@@ -3577,9 +3574,6 @@ static void skylake_update_primary_plane(struct intel_plane *plane,
 
        crtc->dspaddr_offset = surf_addr;
 
-       crtc->adjusted_x = src_x;
-       crtc->adjusted_y = src_y;
-
        spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
 
        if (IS_GEMINILAKE(dev_priv) || IS_CANNONLAKE(dev_priv)) {

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 8296df5..298986f 100644 (file)
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -812,8 +812,6 @@ struct intel_crtc {
         * gen4+ this only adjusts up to a tile, offsets within a tile are
         * handled in the hw itself (with the TILEOFF register). */
        u32 dspaddr_offset;
-       int adjusted_x;
-       int adjusted_y;
 
        struct intel_crtc_state *config;
 

diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c
index 8e3a055..0ee65be 100644 (file)
--- a/drivers/gpu/drm/i915/intel_fbc.c
+++ b/drivers/gpu/drm/i915/intel_fbc.c
@@ -71,7 +71,10 @@ static inline bool no_fbc_on_multiple_pipes(struct drm_i915_private *dev_priv)
  */
 static unsigned int get_crtc_fence_y_offset(struct intel_crtc *crtc)
 {
-       return crtc->base.y - crtc->adjusted_y;
+       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;
 }
 
 /*
@@ -727,8 +730,8 @@ static bool intel_fbc_hw_tracking_covers_screen(struct intel_crtc *crtc)
 
        intel_fbc_get_plane_source_size(&fbc->state_cache, &effective_w,
                                        &effective_h);
-       effective_w += crtc->adjusted_x;
-       effective_h += crtc->adjusted_y;
+       effective_w += fbc->state_cache.plane.adjusted_x;
+       effective_h += fbc->state_cache.plane.adjusted_y;
 
        return effective_w <= max_w && effective_h <= max_h;
 }
@@ -757,6 +760,8 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc,
        cache->plane.src_w = drm_rect_width(&plane_state->base.src) >> 16;
        cache->plane.src_h = drm_rect_height(&plane_state->base.src) >> 16;
        cache->plane.visible = plane_state->base.visible;
+       cache->plane.adjusted_x = plane_state->main.x;
+       cache->plane.adjusted_y = plane_state->main.y;
 
        if (!cache->plane.visible)
                return;