Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31694658 authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter
Browse files

drm/i915: kill ivybridge_irq_preinstall 



After Daniel's latest changes it's now equal to
ironlake_irq_preinstall.

Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 0b74b508

drivers/gpu/drm/i915/i915_irq.c

+1 −20
Original line number Diff line number Diff line
@@ -2093,25 +2093,6 @@ static void ironlake_irq_preinstall(struct drm_device *dev) 
	ibx_irq_preinstall(dev);

}



static void ivybridge_irq_preinstall(struct drm_device *dev)

{

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;



	atomic_set(&dev_priv->irq_received, 0);



	I915_WRITE(HWSTAM, 0xeffe);



	/* XXX hotplug from PCH */



	I915_WRITE(DEIMR, 0xffffffff);

	I915_WRITE(DEIER, 0x0);

	POSTING_READ(DEIER);



	gen5_gt_irq_preinstall(dev);



	ibx_irq_preinstall(dev);

}



static void valleyview_irq_preinstall(struct drm_device *dev)

{

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
@@ -3120,7 +3101,7 @@ void intel_irq_init(struct drm_device *dev) 
	} else if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev)) {

		/* Share uninstall handlers with ILK/SNB */

		dev->driver->irq_handler = ivybridge_irq_handler;

		dev->driver->irq_preinstall = ivybridge_irq_preinstall;

		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;