diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-07 09:31:52 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-08 12:10:14 -0500 |
commit | 13b3a0a77625c09c84825ef6ba81d957ec207841 (patch) | |
tree | 9474be07a93cfdb3d9c71f5e7b498aa2db3c94b7 | |
parent | 38d83c96a3f67ba2cfb7454f310791a3c58e71ad (diff) |
drm/i915: Mask the vblank interrupt on bdw by default
Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index bf71e352fd74..1ce5722c2462 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c | |||
@@ -2917,15 +2917,15 @@ static void gen8_gt_irq_postinstall(struct drm_i915_private *dev_priv) | |||
2917 | static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv) | 2917 | static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv) |
2918 | { | 2918 | { |
2919 | struct drm_device *dev = dev_priv->dev; | 2919 | struct drm_device *dev = dev_priv->dev; |
2920 | uint32_t de_pipe_enables = GEN8_PIPE_FLIP_DONE | | 2920 | uint32_t de_pipe_masked = GEN8_PIPE_FLIP_DONE | |
2921 | GEN8_PIPE_VBLANK | | 2921 | GEN8_PIPE_CDCLK_CRC_DONE | |
2922 | GEN8_PIPE_CDCLK_CRC_DONE | | 2922 | GEN8_PIPE_FIFO_UNDERRUN | |
2923 | GEN8_PIPE_FIFO_UNDERRUN | | 2923 | GEN8_DE_PIPE_IRQ_FAULT_ERRORS; |
2924 | GEN8_DE_PIPE_IRQ_FAULT_ERRORS; | 2924 | uint32_t de_pipe_enables = de_pipe_masked | GEN8_PIPE_VBLANK; |
2925 | int pipe; | 2925 | int pipe; |
2926 | dev_priv->de_irq_mask[PIPE_A] = ~de_pipe_enables; | 2926 | dev_priv->de_irq_mask[PIPE_A] = ~de_pipe_masked; |
2927 | dev_priv->de_irq_mask[PIPE_B] = ~de_pipe_enables; | 2927 | dev_priv->de_irq_mask[PIPE_B] = ~de_pipe_masked; |
2928 | dev_priv->de_irq_mask[PIPE_C] = ~de_pipe_enables; | 2928 | dev_priv->de_irq_mask[PIPE_C] = ~de_pipe_masked; |
2929 | 2929 | ||
2930 | for_each_pipe(pipe) { | 2930 | for_each_pipe(pipe) { |
2931 | u32 tmp = I915_READ(GEN8_DE_PIPE_IIR(pipe)); | 2931 | u32 tmp = I915_READ(GEN8_DE_PIPE_IIR(pipe)); |