Commit 23a09c76 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Use GEN5_IRQ_RESET() on vlv/chv 



Replace the hand rolled IIR,IER,IMR disable sequences with
GEN5_IRQ_RESET().

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 76e41860

drivers/gpu/drm/i915/i915_irq.c

+5 −20
Original line number Diff line number Diff line
@@ -3128,11 +3128,8 @@ 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_IMR, 0xffffffff);

	I915_WRITE(VLV_IER, 0x0);

	I915_WRITE(VLV_IIR, 0xffffffff);

	I915_WRITE(VLV_IIR, 0xffffffff);

	POSTING_READ(VLV_IIR);



	GEN5_IRQ_RESET(VLV_);

}



static void gen8_gt_irq_reset(struct drm_i915_private *dev_priv)
@@ -3197,11 +3194,7 @@ static void cherryview_irq_preinstall(struct drm_device *dev) 
	for_each_pipe(dev_priv, pipe)

		I915_WRITE(PIPESTAT(pipe), 0xffff);



	I915_WRITE(VLV_IMR, 0xffffffff);

	I915_WRITE(VLV_IER, 0x0);

	I915_WRITE(VLV_IIR, 0xffffffff);

	I915_WRITE(VLV_IIR, 0xffffffff);

	POSTING_READ(VLV_IIR);

	GEN5_IRQ_RESET(VLV_);

}



static void ibx_hpd_irq_setup(struct drm_device *dev)
@@ -3611,11 +3604,7 @@ static void valleyview_irq_uninstall(struct drm_device *dev) 


	dev_priv->irq_mask = 0;



	I915_WRITE(VLV_IMR, 0xffffffff);

	I915_WRITE(VLV_IER, 0x0);

	I915_WRITE(VLV_IIR, 0xffffffff);

	I915_WRITE(VLV_IIR, 0xffffffff);

	POSTING_READ(VLV_IIR);

	GEN5_IRQ_RESET(VLV_);

}



static void cherryview_irq_uninstall(struct drm_device *dev)
@@ -3639,11 +3628,7 @@ static void cherryview_irq_uninstall(struct drm_device *dev) 
	for_each_pipe(dev_priv, pipe)

		I915_WRITE(PIPESTAT(pipe), 0xffff);



	I915_WRITE(VLV_IMR, 0xffffffff);

	I915_WRITE(VLV_IER, 0x0);

	I915_WRITE(VLV_IIR, 0xffffffff);

	I915_WRITE(VLV_IIR, 0xffffffff);

	POSTING_READ(VLV_IIR);

	GEN5_IRQ_RESET(VLV_);

}



static void ironlake_irq_uninstall(struct drm_device *dev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE