Commit 8ea0be4f authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Refactor vlv_display_irq_uninstall() 



Pull the vlv display irq uninstall code into a separate function, for
eventual sharing with chv.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 70ee45e1

drivers/gpu/drm/i915/i915_irq.c

+15 −10
Original line number Diff line number Diff line
@@ -3588,6 +3588,20 @@ static void gen8_irq_uninstall(struct drm_device *dev) 
	gen8_irq_reset(dev);

}



static void vlv_display_irq_uninstall(struct drm_i915_private *dev_priv)

{

	/* Interrupt setup is already guaranteed to be single-threaded, this is

	 * just to make the assert_spin_locked check happy. */

	spin_lock_irq(&dev_priv->irq_lock);

	if (dev_priv->display_irqs_enabled)

		valleyview_display_irqs_uninstall(dev_priv);

	spin_unlock_irq(&dev_priv->irq_lock);



	vlv_display_irq_reset(dev_priv);



	dev_priv->irq_mask = 0;

}



static void valleyview_irq_uninstall(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -3601,16 +3615,7 @@ static void valleyview_irq_uninstall(struct drm_device *dev) 


	I915_WRITE(HWSTAM, 0xffffffff);



	/* Interrupt setup is already guaranteed to be single-threaded, this is

	 * just to make the assert_spin_locked check happy. */

	spin_lock_irq(&dev_priv->irq_lock);

	if (dev_priv->display_irqs_enabled)

		valleyview_display_irqs_uninstall(dev_priv);

	spin_unlock_irq(&dev_priv->irq_lock);



	vlv_display_irq_reset(dev_priv);



	dev_priv->irq_mask = 0;

	vlv_display_irq_uninstall(dev_priv);

}



static void cherryview_irq_uninstall(struct drm_device *dev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE