diff options
| author | Daniel Vetter | 2012-12-01 13:53:40 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2012-12-06 13:14:35 +0100 |
| commit | 4a06e201dae98ed893bae677b7b05bff29fcbab0 (patch) | |
| tree | 34a24d587206fcd0940af6be8835af22688c6ac2 /drivers/gpu/drm/i915/i915_irq.c | |
| parent | drm/i915: Add intel_ring_handle_seqno wrap (diff) | |
| download | kernel-qcow2-linux-4a06e201dae98ed893bae677b7b05bff29fcbab0.tar.gz kernel-qcow2-linux-4a06e201dae98ed893bae677b7b05bff29fcbab0.tar.xz kernel-qcow2-linux-4a06e201dae98ed893bae677b7b05bff29fcbab0.zip | |
drm/i915: haswell has the same irq handlers as ivb
No need to have the exaxt same code twice.
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 68e7cafa13de..2aa23e7fc2ab 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -2711,7 +2711,7 @@ void intel_irq_init(struct drm_device *dev) dev->driver->irq_uninstall = valleyview_irq_uninstall; dev->driver->enable_vblank = valleyview_enable_vblank; dev->driver->disable_vblank = valleyview_disable_vblank; - } else if (IS_IVYBRIDGE(dev)) { + } else if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev)) { /* Share pre & uninstall handlers with ILK/SNB */ dev->driver->irq_handler = ivybridge_irq_handler; dev->driver->irq_preinstall = ironlake_irq_preinstall; @@ -2719,14 +2719,6 @@ void intel_irq_init(struct drm_device *dev) dev->driver->irq_uninstall = ironlake_irq_uninstall; dev->driver->enable_vblank = ivybridge_enable_vblank; dev->driver->disable_vblank = ivybridge_disable_vblank; - } else if (IS_HASWELL(dev)) { - /* Share interrupts handling with IVB */ - dev->driver->irq_handler = ivybridge_irq_handler; - dev->driver->irq_preinstall = ironlake_irq_preinstall; - dev->driver->irq_postinstall = ivybridge_irq_postinstall; - dev->driver->irq_uninstall = ironlake_irq_uninstall; - dev->driver->enable_vblank = ivybridge_enable_vblank; - dev->driver->disable_vblank = ivybridge_disable_vblank; } else if (HAS_PCH_SPLIT(dev)) { dev->driver->irq_handler = ironlake_irq_handler; dev->driver->irq_preinstall = ironlake_irq_preinstall; |