WebSVN – Kolibri OS – Diff – /drivers/video/drm/i915/i915_irq.c

 	spin_unlock(&dev_priv->irq_lock);
 	for_each_pipe(dev_priv, pipe) {
 		if (pipe_stats[pipe] & PIPE_START_VBLANK_INTERRUPT_STATUS &&
 		    intel_pipe_handle_vblank(dev, pipe))
-            /*intel_check_page_flip(dev, pipe)*/;
+			intel_check_page_flip(dev, pipe);
 		if (pipe_stats[pipe] & PLANE_FLIP_DONE_INT_STATUS_VLV) {
-//           intel_prepare_page_flip(dev, pipe);
+			intel_prepare_page_flip(dev, pipe);
-//           intel_finish_page_flip(dev, pipe);
+			intel_finish_page_flip(dev, pipe);
+		}
 		DRM_ERROR("Poison interrupt\n");
 	for_each_pipe(dev_priv, pipe) {
 		if (de_iir & DE_PIPE_VBLANK(pipe) &&
 		    intel_pipe_handle_vblank(dev, pipe))
-            /*intel_check_page_flip(dev, pipe)*/;
+			intel_check_page_flip(dev, pipe);
 		if (de_iir & DE_PIPE_FIFO_UNDERRUN(pipe))
 			intel_cpu_fifo_underrun_irq_handler(dev_priv, pipe);
 		if (de_iir & DE_PIPE_CRC_DONE(pipe))
 			i9xx_pipe_crc_irq_handler(dev, pipe);
 		/* plane/pipes map 1:1 on ilk+ */
 		if (de_iir & DE_PLANE_FLIP_DONE(pipe)) {
-//			intel_prepare_page_flip(dev, pipe);
+			intel_prepare_page_flip(dev, pipe);
-//			intel_finish_page_flip_plane(dev, pipe);
+			intel_finish_page_flip_plane(dev, pipe);
 		intel_opregion_asle_intr(dev);
 	for_each_pipe(dev_priv, pipe) {
 		if (de_iir & (DE_PIPE_VBLANK_IVB(pipe)) &&
 		    intel_pipe_handle_vblank(dev, pipe))
-            /*intel_check_page_flip(dev, pipe)*/;
+			intel_check_page_flip(dev, pipe);
 		/* plane/pipes map 1:1 on ilk+ */
 		if (de_iir & DE_PLANE_FLIP_DONE_IVB(pipe)) {
-//			intel_prepare_page_flip(dev, pipe);
+			intel_prepare_page_flip(dev, pipe);
-//			intel_finish_page_flip_plane(dev, pipe);
+			intel_finish_page_flip_plane(dev, pipe);
+		}
+	}
 			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)*/;
+				intel_check_page_flip(dev, pipe);
 			if (INTEL_INFO(dev_priv)->gen >= 9)
 				flip_done = pipe_iir & GEN9_PIPE_PLANE1_FLIP_DONE;
+			else
+				flip_done = pipe_iir & GEN8_PIPE_PRIMARY_FLIP_DONE;
+			if (flip_done) {
-			else
+				intel_prepare_page_flip(dev, pipe);
-				flip_done = pipe_iir & GEN8_PIPE_PRIMARY_FLIP_DONE;
+				intel_finish_page_flip_plane(dev, pipe);
+			}
 			if (HAS_PCH_SPT(dev_priv))
 				spt_irq_handler(dev, pch_iir);
 			else
 				cpt_irq_handler(dev, pch_iir);
+		} else {
+			/*
+			 * Like on previous PCH there seems to be something
+			 * fishy going on with forwarding PCH interrupts.
-		} else
+			 */
-			DRM_ERROR("The master control interrupt lied (SDE)!\n");
+			DRM_DEBUG_DRIVER("The master control interrupt lied (SDE)!\n");
+		}
+	}
 	/* Wake up __wait_seqno, potentially holding dev->struct_mutex. */
 	for_each_ring(ring, dev_priv, i)
+		wake_up_all(&ring->irq_queue);
-		wake_up_all(&ring->irq_queue);
+	/* Wake up intel_crtc_wait_for_pending_flips, holding crtc->mutex. */
 	wake_up_all(&dev_priv->pending_flip_queue);
 	/*
 	 * an interrupt per se, we watch for the change at vblank.
 	 */
 	if (I915_READ16(ISR) & flip_pending)
 		goto check_page_flip;
-//   intel_prepare_page_flip(dev, plane);
+	intel_prepare_page_flip(dev, plane);
-//   intel_finish_page_flip(dev, pipe);
+	intel_finish_page_flip(dev, pipe);
 	return true;
 check_page_flip:
-//   intel_check_page_flip(dev, pipe);
+	intel_check_page_flip(dev, pipe);
 	return false;
+}
 	 * an interrupt per se, we watch for the change at vblank.
 	 */
 	if (I915_READ(ISR) & flip_pending)
 		goto check_page_flip;
+	intel_prepare_page_flip(dev, plane);
 	intel_finish_page_flip(dev, pipe);
 	return true;
 check_page_flip:
-check_page_flip:
+	intel_check_page_flip(dev, pipe);
 	return false;
+}
  * resources acquired in the init functions.
  */
 void intel_irq_uninstall(struct drm_i915_private *dev_priv)
+{
 //	drm_irq_uninstall(dev_priv->dev);
-//	intel_hpd_cancel_work(dev_priv);
+	intel_hpd_cancel_work(dev_priv);
 	dev_priv->pm.irqs_enabled = false;
+}
 /**

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/i915/i915_irq.c – Rev 6296 → 6320