diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index a6fbe64..49fce65 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2063,12 +2063,14 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg)
 
 		pipe_iir = I915_READ(GEN8_DE_PIPE_IIR(pipe));
 		if (pipe_iir) {
+			bool check_page_flip = false;
+
 			ret = IRQ_HANDLED;
 			I915_WRITE(GEN8_DE_PIPE_IIR(pipe), pipe_iir);
 
 			if (pipe_iir & GEN8_PIPE_VBLANK &&
 			    intel_pipe_handle_vblank(dev, pipe))
-				intel_check_page_flip(dev, pipe);
+				check_page_flip = true;
 
 			if (IS_GEN9(dev))
 				flip_done = pipe_iir & GEN9_PIPE_PLANE1_FLIP_DONE;
@@ -2080,6 +2082,9 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg)
 				intel_finish_page_flip_plane(dev, pipe);
 			}
 
+			if (check_page_flip)
+				intel_check_page_flip(dev, pipe);
+
 			if (pipe_iir & GEN8_PIPE_CDCLK_CRC_DONE)
 				hsw_pipe_crc_irq_handler(dev, pipe);