diff options
author | Jonathan Gray <jsg@jsg.id.au> | 2013-03-14 12:09:04 +1100 |
---|---|---|
committer | Jonathan Gray <jsg@jsg.id.au> | 2013-03-14 12:09:04 +1100 |
commit | ebeba014a07be5f7a697a9f541a8c3c268cd7f49 (patch) | |
tree | 5f0007caca71aeacea23552bf9294a8c8b236796 /sys/dev/pci/drm | |
parent | 3c2df7440c0f8173fb3ee8004c1b17fcf1985188 (diff) |
don't enable the ASLE interrupt as we don't handle it yet
Diffstat (limited to 'sys/dev/pci/drm')
-rw-r--r-- | sys/dev/pci/drm/i915_irq.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sys/dev/pci/drm/i915_irq.c b/sys/dev/pci/drm/i915_irq.c index b670483851f..d5fc2f5e4bc 100644 --- a/sys/dev/pci/drm/i915_irq.c +++ b/sys/dev/pci/drm/i915_irq.c @@ -2394,7 +2394,11 @@ i915_irq_postinstall(struct drm_device *dev) /* Unmask the interrupts that we always want on. */ dev_priv->irq_mask = +#ifdef notyet ~(I915_ASLE_INTERRUPT | +#else + ~( +#endif I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT | @@ -2402,7 +2406,9 @@ i915_irq_postinstall(struct drm_device *dev) I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT); enable_mask = +#ifdef notyet I915_ASLE_INTERRUPT | +#endif I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT | @@ -2614,7 +2620,11 @@ i965_irq_postinstall(struct drm_device *dev) u32 error_mask; /* Unmask the interrupts that we always want on. */ +#ifdef notyet dev_priv->irq_mask = ~(I915_ASLE_INTERRUPT | +#else + dev_priv->irq_mask = ~( +#endif I915_DISPLAY_PORT_INTERRUPT | I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | |