drm/i915: Skip vblank wait if cxsr was already off

Before we attempt to turn any planes on or off we must first exit
csxr. That's due to cxsr effectively making the plane enable bits
read-only. Currently we achieve that with a vblank wait right after
toggling the cxsr enable bit. We do the vblank wait even if cxsr was
already off, which seems wasteful, so let's try to only do it when
absolutely necessary.

We could start tracking the cxsr state fully somewhere, but for now
it seems easiest to just have intel_set_memory_cxsr() return the
previous cxsr state.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1480354637-14209-11-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 3868eb59b908fcb0d83ace442bdbd0c77caf1c3e..74658acb307b83d9632fb1ae50d7f8ce5150ee9b 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3575,7 +3575,7 @@ extern void i915_redisable_vga_power_on(struct drm_i915_private *dev_priv);
 extern bool ironlake_set_drps(struct drm_i915_private *dev_priv, u8 val);
 extern void intel_init_pch_refclk(struct drm_i915_private *dev_priv);
 extern void intel_set_rps(struct drm_i915_private *dev_priv, u8 val);
-extern void intel_set_memory_cxsr(struct drm_i915_private *dev_priv,
+extern bool intel_set_memory_cxsr(struct drm_i915_private *dev_priv,
                                  bool enable);
 
 int i915_reg_read_ioctl(struct drm_device *dev, void *data,

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 4c4882f9136989a0724bccbe280114edf9ee6d49..231f099bbd344738c3018ab6c2f49efabf8b2951 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5021,10 +5021,9 @@ intel_pre_disable_primary_noatomic(struct drm_crtc *crtc)
         * event which is after the vblank start event, so we need to have a
         * wait-for-vblank between disabling the plane and the pipe.
         */
-       if (HAS_GMCH_DISPLAY(dev_priv)) {
-               intel_set_memory_cxsr(dev_priv, false);
+       if (HAS_GMCH_DISPLAY(dev_priv) &&
+           intel_set_memory_cxsr(dev_priv, false))
                intel_wait_for_vblank(dev_priv, pipe);
-       }
 }
 
 static void intel_post_plane_update(struct intel_crtc_state *old_crtc_state)
@@ -5099,10 +5098,9 @@ static void intel_pre_plane_update(struct intel_crtc_state *old_crtc_state)
                 * event which is after the vblank start event, so we need to have a
                 * wait-for-vblank between disabling the plane and the pipe.
                 */
-               if (old_crtc_state->base.active) {
-                       intel_set_memory_cxsr(dev_priv, false);
+               if (old_crtc_state->base.active &&
+                   intel_set_memory_cxsr(dev_priv, false))
                        intel_wait_for_vblank(dev_priv, crtc->pipe);
-               }
        }
 
        /*

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 4a9e1f36d8ffe4f044c9d476904c99b4ed6f41c3..cb6b26b9134fe755aa4ad4ee63f651466cfee14b 100644 (file)
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -312,22 +312,30 @@ static void chv_set_memory_pm5(struct drm_i915_private *dev_priv, bool enable)
 #define FW_WM(value, plane) \
        (((value) << DSPFW_ ## plane ## _SHIFT) & DSPFW_ ## plane ## _MASK)
 
-static void _intel_set_memory_cxsr(struct drm_i915_private *dev_priv, bool enable)
+static bool _intel_set_memory_cxsr(struct drm_i915_private *dev_priv, bool enable)
 {
+       bool was_enabled;
        u32 val;
 
        if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
+               was_enabled = I915_READ(FW_BLC_SELF_VLV) & FW_CSPWRDWNEN;
                I915_WRITE(FW_BLC_SELF_VLV, enable ? FW_CSPWRDWNEN : 0);
                POSTING_READ(FW_BLC_SELF_VLV);
        } else if (IS_G4X(dev_priv) || IS_CRESTLINE(dev_priv)) {
+               was_enabled = I915_READ(FW_BLC_SELF) & FW_BLC_SELF_EN;
                I915_WRITE(FW_BLC_SELF, enable ? FW_BLC_SELF_EN : 0);
                POSTING_READ(FW_BLC_SELF);
        } else if (IS_PINEVIEW(dev_priv)) {
-               val = I915_READ(DSPFW3) & ~PINEVIEW_SELF_REFRESH_EN;
-               val |= enable ? PINEVIEW_SELF_REFRESH_EN : 0;
+               val = I915_READ(DSPFW3);
+               was_enabled = val & PINEVIEW_SELF_REFRESH_EN;
+               if (enable)
+                       val |= PINEVIEW_SELF_REFRESH_EN;
+               else
+                       val &= ~PINEVIEW_SELF_REFRESH_EN;
                I915_WRITE(DSPFW3, val);
                POSTING_READ(DSPFW3);
        } else if (IS_I945G(dev_priv) || IS_I945GM(dev_priv)) {
+               was_enabled = I915_READ(FW_BLC_SELF) & FW_BLC_SELF_EN;
                val = enable ? _MASKED_BIT_ENABLE(FW_BLC_SELF_EN) :
                               _MASKED_BIT_DISABLE(FW_BLC_SELF_EN);
                I915_WRITE(FW_BLC_SELF, val);
@@ -338,23 +346,32 @@ static void _intel_set_memory_cxsr(struct drm_i915_private *dev_priv, bool enabl
                 * and yet it does have the related watermark in
                 * FW_BLC_SELF. What's going on?
                 */
+               was_enabled = I915_READ(INSTPM) & INSTPM_SELF_EN;
                val = enable ? _MASKED_BIT_ENABLE(INSTPM_SELF_EN) :
                               _MASKED_BIT_DISABLE(INSTPM_SELF_EN);
                I915_WRITE(INSTPM, val);
                POSTING_READ(INSTPM);
        } else {
-               return;
+               return false;
        }
 
-       DRM_DEBUG_KMS("memory self-refresh is %s\n", enableddisabled(enable));
+       DRM_DEBUG_KMS("memory self-refresh is %s (was %s)\n",
+                     enableddisabled(enable),
+                     enableddisabled(was_enabled));
+
+       return was_enabled;
 }
 
-void intel_set_memory_cxsr(struct drm_i915_private *dev_priv, bool enable)
+bool intel_set_memory_cxsr(struct drm_i915_private *dev_priv, bool enable)
 {
+       bool ret;
+
        mutex_lock(&dev_priv->wm.wm_mutex);
-       _intel_set_memory_cxsr(dev_priv, enable);
+       ret = _intel_set_memory_cxsr(dev_priv, enable);
        dev_priv->wm.vlv.cxsr = enable;
        mutex_unlock(&dev_priv->wm.wm_mutex);
+
+       return ret;
 }
 
 /*