drm/i915/skl: Log the order in which we flush the pipes in the WM code

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index ec7b86bfe701e710875d469f8feeddde472017c4..d0dbd656eecb119ab97b70ea663fb91acfb0d8a5 100644 (file)
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3536,11 +3536,14 @@ static void skl_write_wm_values(struct drm_i915_private *dev_priv,
  * We need to sequence the re-allocation: C, B, A (and not B, C, A).
  */
 
-static void skl_wm_flush_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)
+static void
+skl_wm_flush_pipe(struct drm_i915_private *dev_priv, enum pipe pipe, int pass)
 {
        struct drm_device *dev = dev_priv->dev;
        int plane;
 
+       DRM_DEBUG_KMS("flush pipe %c (pass %d)\n", pipe_name(pipe), pass);
+
        for_each_plane(pipe, plane) {
                I915_WRITE(PLANE_SURF(pipe, plane),
                           I915_READ(PLANE_SURF(pipe, plane)));
@@ -3591,7 +3594,7 @@ static void skl_flush_wm_values(struct drm_i915_private *dev_priv,
                if (!skl_ddb_allocation_included(cur_ddb, new_ddb, pipe))
                        continue;
 
-               skl_wm_flush_pipe(dev_priv, pipe);
+               skl_wm_flush_pipe(dev_priv, pipe, 1);
                intel_wait_for_vblank(dev, pipe);
 
                reallocated[pipe] = true;
@@ -3616,7 +3619,7 @@ static void skl_flush_wm_values(struct drm_i915_private *dev_priv,
 
                if (skl_ddb_entry_size(&new_ddb->pipe[pipe]) <
                    skl_ddb_entry_size(&cur_ddb->pipe[pipe])) {
-                       skl_wm_flush_pipe(dev_priv, pipe);
+                       skl_wm_flush_pipe(dev_priv, pipe, 2);
                        intel_wait_for_vblank(dev, pipe);
                }
 
@@ -3642,7 +3645,7 @@ static void skl_flush_wm_values(struct drm_i915_private *dev_priv,
                if (reallocated[pipe])
                        continue;
 
-               skl_wm_flush_pipe(dev_priv, pipe);
+               skl_wm_flush_pipe(dev_priv, pipe, 3);
        }
 }