[v2] drm/i915/display: Skip multiple FBC updates within same frame

[Uma Shankar]

Skip Multiple fbc activation and de-activation within the same frame.

v2: Add a wait for vblank instead of skipping totally

Signed-off-by: Uma Shankar <uma.shankar at intel.com>
---
 drivers/gpu/drm/i915/display/intel_fbc.c | 29 ++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
index b8eef61ac078..2f35dc6c402b 100644
--- a/drivers/gpu/drm/i915/display/intel_fbc.c
+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
@@ -1055,6 +1055,8 @@ static void __intel_fbc_post_update(struct intel_crtc *crtc)
 {
 	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
 	struct intel_fbc *fbc = &dev_priv->fbc;
+	static u32 old_frame_cnt = 0;
+	static u32 new_frame_cnt = 0;
 
 	drm_WARN_ON(&dev_priv->drm, !mutex_is_locked(&fbc->lock));
 
@@ -1075,10 +1077,29 @@ static void __intel_fbc_post_update(struct intel_crtc *crtc)
 	if (!intel_fbc_can_activate(crtc))
 		return;
 
-	if (!fbc->busy_bits)
-		intel_fbc_hw_activate(dev_priv);
-	else
-		intel_fbc_deactivate(dev_priv, "frontbuffer write");
+	old_frame_cnt = new_frame_cnt;
+	new_frame_cnt = intel_crtc_get_vblank_counter(crtc);
+	if (!fbc->busy_bits) {
+		if (old_frame_cnt != new_frame_cnt) {
+			intel_fbc_hw_activate(dev_priv);
+			drm_dbg_kms(&dev_priv->drm, "Activating FBC on pipe %c\n",
+				    pipe_name(crtc->pipe));
+		} else {
+			drm_dbg_kms(&dev_priv->drm, "Wait for vblank before Activating FBC on pipe %c\n",
+				    pipe_name(crtc->pipe));
+			intel_wait_for_vblank_if_active(dev_priv, crtc->pipe);
+			intel_fbc_hw_activate(dev_priv);
+		}
+	} else {
+		if (old_frame_cnt != new_frame_cnt) {
+			intel_fbc_deactivate(dev_priv, "frontbuffer write");
+			drm_dbg_kms(&dev_priv->drm, "De-Activating FBC on pipe %c\n",
+					pipe_name(crtc->pipe));
+		} else {
+			drm_dbg_kms(&dev_priv->drm, "Skipped De-Activating FBC on pipe %c\n",
+				    pipe_name(crtc->pipe));
+		}
+	}
 }
 
 void intel_fbc_post_update(struct intel_atomic_state *state,
-- 
2.26.2