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

Commit 723761b8 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Inline ilk/gen8_irq_reset 



No point in having this indirection.

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 85ab3998

drivers/gpu/drm/i915/i915_irq.c

+2 −12
Original line number Diff line number Diff line
@@ -3111,11 +3111,6 @@ static void ironlake_irq_reset(struct drm_device *dev) 
	ibx_irq_reset(dev);

}



static void ironlake_irq_preinstall(struct drm_device *dev)

{

	ironlake_irq_reset(dev);

}



static void valleyview_irq_preinstall(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -3168,11 +3163,6 @@ static void gen8_irq_reset(struct drm_device *dev) 
	ibx_irq_reset(dev);

}



static void gen8_irq_preinstall(struct drm_device *dev)

{

	gen8_irq_reset(dev);

}



static void cherryview_irq_preinstall(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -4381,7 +4371,7 @@ void intel_irq_init(struct drm_device *dev) 
		dev_priv->display.hpd_irq_setup = i915_hpd_irq_setup;

	} else if (IS_GEN8(dev)) {

		dev->driver->irq_handler = gen8_irq_handler;

		dev->driver->irq_preinstall = gen8_irq_preinstall;

		dev->driver->irq_preinstall = gen8_irq_reset;

		dev->driver->irq_postinstall = gen8_irq_postinstall;

		dev->driver->irq_uninstall = gen8_irq_uninstall;

		dev->driver->enable_vblank = gen8_enable_vblank;
@@ -4389,7 +4379,7 @@ void intel_irq_init(struct drm_device *dev) 
		dev_priv->display.hpd_irq_setup = ibx_hpd_irq_setup;

	} else if (HAS_PCH_SPLIT(dev)) {

		dev->driver->irq_handler = ironlake_irq_handler;

		dev->driver->irq_preinstall = ironlake_irq_preinstall;

		dev->driver->irq_preinstall = ironlake_irq_reset;

		dev->driver->irq_postinstall = ironlake_irq_postinstall;

		dev->driver->irq_uninstall = ironlake_irq_uninstall;

		dev->driver->enable_vblank = ironlake_enable_vblank;