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

Commit 76e41860 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Use a consistent order between IIR, IER, IMR writes on vlv/chv 



Follow the same ordering rules for the IIR,IER,IMR writes on vlv/chv
that we do on other gen5+ platforms.

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 8e20599a

drivers/gpu/drm/i915/i915_irq.c

+18 −11
Original line number Diff line number Diff line
@@ -3128,10 +3128,11 @@ static void valleyview_irq_preinstall(struct drm_device *dev) 
	I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));

	for_each_pipe(dev_priv, pipe)

		I915_WRITE(PIPESTAT(pipe), 0xffff);

	I915_WRITE(VLV_IIR, 0xffffffff);

	I915_WRITE(VLV_IMR, 0xffffffff);

	I915_WRITE(VLV_IER, 0x0);

	POSTING_READ(VLV_IER);

	I915_WRITE(VLV_IIR, 0xffffffff);

	I915_WRITE(VLV_IIR, 0xffffffff);

	POSTING_READ(VLV_IIR);

}



static void gen8_gt_irq_reset(struct drm_i915_private *dev_priv)
@@ -3199,6 +3200,7 @@ static void cherryview_irq_preinstall(struct drm_device *dev) 
	I915_WRITE(VLV_IMR, 0xffffffff);

	I915_WRITE(VLV_IER, 0x0);

	I915_WRITE(VLV_IIR, 0xffffffff);

	I915_WRITE(VLV_IIR, 0xffffffff);

	POSTING_READ(VLV_IIR);

}
@@ -3362,9 +3364,9 @@ static void valleyview_display_irqs_install(struct drm_i915_private *dev_priv) 


	I915_WRITE(VLV_IIR, iir_mask);

	I915_WRITE(VLV_IIR, iir_mask);

	I915_WRITE(VLV_IMR, dev_priv->irq_mask);

	I915_WRITE(VLV_IER, ~dev_priv->irq_mask);

	POSTING_READ(VLV_IER);

	I915_WRITE(VLV_IMR, dev_priv->irq_mask);

	POSTING_READ(VLV_IMR);

}



static void valleyview_display_irqs_uninstall(struct drm_i915_private *dev_priv)
@@ -3377,8 +3379,8 @@ static void valleyview_display_irqs_uninstall(struct drm_i915_private *dev_priv) 
		   I915_DISPLAY_PIPE_B_EVENT_INTERRUPT;



	dev_priv->irq_mask |= iir_mask;

	I915_WRITE(VLV_IER, ~dev_priv->irq_mask);

	I915_WRITE(VLV_IMR, dev_priv->irq_mask);

	I915_WRITE(VLV_IER, ~dev_priv->irq_mask);

	I915_WRITE(VLV_IIR, iir_mask);

	I915_WRITE(VLV_IIR, iir_mask);

	POSTING_READ(VLV_IIR);
@@ -3432,10 +3434,11 @@ static int valleyview_irq_postinstall(struct drm_device *dev) 
	I915_WRITE(PORT_HOTPLUG_EN, 0);

	POSTING_READ(PORT_HOTPLUG_EN);



	I915_WRITE(VLV_IMR, dev_priv->irq_mask);

	I915_WRITE(VLV_IER, ~dev_priv->irq_mask);

	I915_WRITE(VLV_IIR, 0xffffffff);

	POSTING_READ(VLV_IER);

	I915_WRITE(VLV_IIR, 0xffffffff);

	I915_WRITE(VLV_IER, ~dev_priv->irq_mask);

	I915_WRITE(VLV_IMR, dev_priv->irq_mask);

	POSTING_READ(VLV_IMR);



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

	 * just to make the assert_spin_locked check happy. */
@@ -3559,8 +3562,10 @@ static int cherryview_irq_postinstall(struct drm_device *dev) 
	spin_unlock_irq(&dev_priv->irq_lock);



	I915_WRITE(VLV_IIR, 0xffffffff);

	I915_WRITE(VLV_IMR, dev_priv->irq_mask);

	I915_WRITE(VLV_IIR, 0xffffffff);

	I915_WRITE(VLV_IER, enable_mask);

	I915_WRITE(VLV_IMR, dev_priv->irq_mask);

	POSTING_READ(VLV_IMR);



	gen8_gt_irq_postinstall(dev_priv);
@@ -3606,10 +3611,11 @@ static void valleyview_irq_uninstall(struct drm_device *dev) 


	dev_priv->irq_mask = 0;



	I915_WRITE(VLV_IIR, 0xffffffff);

	I915_WRITE(VLV_IMR, 0xffffffff);

	I915_WRITE(VLV_IER, 0x0);

	POSTING_READ(VLV_IER);

	I915_WRITE(VLV_IIR, 0xffffffff);

	I915_WRITE(VLV_IIR, 0xffffffff);

	POSTING_READ(VLV_IIR);

}



static void cherryview_irq_uninstall(struct drm_device *dev)
@@ -3636,6 +3642,7 @@ static void cherryview_irq_uninstall(struct drm_device *dev) 
	I915_WRITE(VLV_IMR, 0xffffffff);

	I915_WRITE(VLV_IER, 0x0);

	I915_WRITE(VLV_IIR, 0xffffffff);

	I915_WRITE(VLV_IIR, 0xffffffff);

	POSTING_READ(VLV_IIR);

}