drm/i915/chv: Clarify VLV/CHV PIPESTAT bits a bit more
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 9 Apr 2014 10:28:48 +0000 (13:28 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 20 May 2014 13:23:33 +0000 (15:23 +0200)
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Antti Koskipää <antti.koskipaa@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_irq.c

index 3c720d083ab01a675964aa4dcb5a1c28ab0e8ae6..443062faff5ee017ec912a43bc42b61c65803adc 100644 (file)
@@ -618,11 +618,17 @@ static u32 vlv_get_pipestat_enable_mask(struct drm_device *dev, u32 status_mask)
        u32 enable_mask = status_mask << 16;
 
        /*
-        * On pipe A we don't support the PSR interrupt yet, on pipe B the
-        * same bit MBZ.
+        * On pipe A we don't support the PSR interrupt yet,
+        * on pipe B and C the same bit MBZ.
         */
        if (WARN_ON_ONCE(status_mask & PIPE_A_PSR_STATUS_VLV))
                return 0;
+       /*
+        * On pipe B and C we don't support the PSR interrupt yet, on pipe
+        * A the same bit is for perf counters which we don't use either.
+        */
+       if (WARN_ON_ONCE(status_mask & PIPE_B_PSR_STATUS_VLV))
+               return 0;
 
        enable_mask &= ~(PIPE_FIFO_UNDERRUN_STATUS |
                         SPRITE0_FLIP_DONE_INT_EN_VLV |