diff options
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index ed26b7b7376a..a7e4b1f27497 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c | |||
@@ -354,7 +354,7 @@ irqreturn_t ironlake_irq_handler(struct drm_device *dev) | |||
354 | READ_BREADCRUMB(dev_priv); | 354 | READ_BREADCRUMB(dev_priv); |
355 | } | 355 | } |
356 | 356 | ||
357 | if (gt_iir & GT_USER_INTERRUPT) { | 357 | if (gt_iir & GT_PIPE_NOTIFY) { |
358 | u32 seqno = i915_get_gem_seqno(dev); | 358 | u32 seqno = i915_get_gem_seqno(dev); |
359 | dev_priv->mm.irq_gem_seqno = seqno; | 359 | dev_priv->mm.irq_gem_seqno = seqno; |
360 | trace_i915_gem_request_complete(dev, seqno); | 360 | trace_i915_gem_request_complete(dev, seqno); |
@@ -1011,7 +1011,7 @@ void i915_user_irq_get(struct drm_device *dev) | |||
1011 | spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags); | 1011 | spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags); |
1012 | if (dev->irq_enabled && (++dev_priv->user_irq_refcount == 1)) { | 1012 | if (dev->irq_enabled && (++dev_priv->user_irq_refcount == 1)) { |
1013 | if (HAS_PCH_SPLIT(dev)) | 1013 | if (HAS_PCH_SPLIT(dev)) |
1014 | ironlake_enable_graphics_irq(dev_priv, GT_USER_INTERRUPT); | 1014 | ironlake_enable_graphics_irq(dev_priv, GT_PIPE_NOTIFY); |
1015 | else | 1015 | else |
1016 | i915_enable_irq(dev_priv, I915_USER_INTERRUPT); | 1016 | i915_enable_irq(dev_priv, I915_USER_INTERRUPT); |
1017 | } | 1017 | } |
@@ -1027,7 +1027,7 @@ void i915_user_irq_put(struct drm_device *dev) | |||
1027 | BUG_ON(dev->irq_enabled && dev_priv->user_irq_refcount <= 0); | 1027 | BUG_ON(dev->irq_enabled && dev_priv->user_irq_refcount <= 0); |
1028 | if (dev->irq_enabled && (--dev_priv->user_irq_refcount == 0)) { | 1028 | if (dev->irq_enabled && (--dev_priv->user_irq_refcount == 0)) { |
1029 | if (HAS_PCH_SPLIT(dev)) | 1029 | if (HAS_PCH_SPLIT(dev)) |
1030 | ironlake_disable_graphics_irq(dev_priv, GT_USER_INTERRUPT); | 1030 | ironlake_disable_graphics_irq(dev_priv, GT_PIPE_NOTIFY); |
1031 | else | 1031 | else |
1032 | i915_disable_irq(dev_priv, I915_USER_INTERRUPT); | 1032 | i915_disable_irq(dev_priv, I915_USER_INTERRUPT); |
1033 | } | 1033 | } |
@@ -1311,7 +1311,7 @@ static int ironlake_irq_postinstall(struct drm_device *dev) | |||
1311 | /* enable kind of interrupts always enabled */ | 1311 | /* enable kind of interrupts always enabled */ |
1312 | u32 display_mask = DE_MASTER_IRQ_CONTROL | DE_GSE | DE_PCH_EVENT | | 1312 | u32 display_mask = DE_MASTER_IRQ_CONTROL | DE_GSE | DE_PCH_EVENT | |
1313 | DE_PLANEA_FLIP_DONE | DE_PLANEB_FLIP_DONE; | 1313 | DE_PLANEA_FLIP_DONE | DE_PLANEB_FLIP_DONE; |
1314 | u32 render_mask = GT_USER_INTERRUPT; | 1314 | u32 render_mask = GT_PIPE_NOTIFY; |
1315 | u32 hotplug_mask = SDE_CRT_HOTPLUG | SDE_PORTB_HOTPLUG | | 1315 | u32 hotplug_mask = SDE_CRT_HOTPLUG | SDE_PORTB_HOTPLUG | |
1316 | SDE_PORTC_HOTPLUG | SDE_PORTD_HOTPLUG; | 1316 | SDE_PORTC_HOTPLUG | SDE_PORTD_HOTPLUG; |
1317 | 1317 | ||