drm/i915: crc support for hsw

hw designers decided to change the CRC registers and coalesce them all
into one. Otherwise nothing changed. I've opted for a new hsw_ version
to grab the crc sample since hsw+1 will have the same crc registers,
but different interrupt source registers. So this little helper
function will come handy there.

Also refactor the display error handler with a neat pipe loop.

v2: Use for_each_pipe.

Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

3 files changed, 27 insertions, 20 deletions

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 649c00ebf6e0..061182a0ce1b 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1997,7 +1997,7 @@ static int pipe_crc_set_source(struct drm_device *dev, enum pipe pipe,
         u32 val;
         int ret;
 
-        if (!(IS_IVYBRIDGE(dev) || IS_GEN5(dev) || IS_GEN6(dev)))
+        if (!(INTEL_INFO(dev)->gen >= 5 && !IS_VALLEYVIEW(dev)))
                 return -ENODEV;
 
         if (pipe_crc->source == source)
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index eaf12680c2ea..156a1a4d8e51 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1228,6 +1228,15 @@ static void display_pipe_crc_update(struct drm_device *dev, enum pipe pipe,
         wake_up_interruptible(&pipe_crc->wq);
 }
 
+static void hsw_pipe_crc_update(struct drm_device *dev, enum pipe pipe)
+{
+        struct drm_i915_private *dev_priv = dev->dev_private;
+
+        display_pipe_crc_update(dev, pipe,
+                                I915_READ(PIPE_CRC_RES_1_IVB(pipe)),
+                                0, 0, 0, 0);
+}
+
 static void ivb_pipe_crc_update(struct drm_device *dev, enum pipe pipe)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
@@ -1252,6 +1261,7 @@ static void ilk_pipe_crc_update(struct drm_device *dev, enum pipe pipe)
                                 I915_READ(PIPE_CRC_RES_RES2_ILK(pipe)));
 }
 #else
+static inline void hsw_pipe_crc_update(struct drm_device *dev, int pipe) {}
 static inline void ivb_pipe_crc_update(struct drm_device *dev, int pipe) {}
 static inline void ilk_pipe_crc_update(struct drm_device *dev, int pipe) {}
 #endif
@@ -1418,30 +1428,26 @@ static void ivb_err_int_handler(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         u32 err_int = I915_READ(GEN7_ERR_INT);
+        enum pipe pipe;
 
         if (err_int & ERR_INT_POISON)
                 DRM_ERROR("Poison interrupt\n");
 
-        if (err_int & ERR_INT_FIFO_UNDERRUN_A)
-                if (intel_set_cpu_fifo_underrun_reporting(dev, PIPE_A, false))
-                        DRM_DEBUG_DRIVER("Pipe A FIFO underrun\n");
-
-        if (err_int & ERR_INT_FIFO_UNDERRUN_B)
-                if (intel_set_cpu_fifo_underrun_reporting(dev, PIPE_B, false))
-                        DRM_DEBUG_DRIVER("Pipe B FIFO underrun\n");
-
-        if (err_int & ERR_INT_FIFO_UNDERRUN_C)
-                if (intel_set_cpu_fifo_underrun_reporting(dev, PIPE_C, false))
-                        DRM_DEBUG_DRIVER("Pipe C FIFO underrun\n");
-
-        if (err_int & ERR_INT_PIPE_CRC_DONE_A)
-                ivb_pipe_crc_update(dev, PIPE_A);
-
-        if (err_int & ERR_INT_PIPE_CRC_DONE_B)
-                ivb_pipe_crc_update(dev, PIPE_B);
+        for_each_pipe(pipe) {
+                if (err_int & ERR_INT_FIFO_UNDERRUN(pipe)) {
+                        if (intel_set_cpu_fifo_underrun_reporting(dev, pipe,
+                                                                  false))
+                                DRM_DEBUG_DRIVER("Pipe %c FIFO underrun\n",
+                                                 pipe_name(pipe));
+                }
 
-        if (err_int & ERR_INT_PIPE_CRC_DONE_C)
-                ivb_pipe_crc_update(dev, PIPE_C);
+                if (err_int & ERR_INT_PIPE_CRC_DONE(pipe)) {
+                        if (IS_IVYBRIDGE(dev))
+                                ivb_pipe_crc_update(dev, pipe);
+                        else
+                                hsw_pipe_crc_update(dev, pipe);
+                }
+        }
 
         I915_WRITE(GEN7_ERR_INT, err_int);
 }
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 8b1f2dbc6009..0e7488b64965 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -728,6 +728,7 @@
 #define   ERR_INT_PIPE_CRC_DONE_B       (1<<5)
 #define   ERR_INT_FIFO_UNDERRUN_B       (1<<3)
 #define   ERR_INT_PIPE_CRC_DONE_A       (1<<2)
+#define   ERR_INT_PIPE_CRC_DONE(pipe)   (1<<(2 + pipe*3))
 #define   ERR_INT_FIFO_UNDERRUN_A       (1<<0)
 #define   ERR_INT_FIFO_UNDERRUN(pipe)   (1<<(pipe*3))