Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (a6c0a392) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/drm/i915/i915_irq.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -1740,6 +1740,16 @@ void ironlake_irq_preinstall(struct drm_device *dev)
		INIT_WORK(&dev_priv->rps_work, gen6_pm_rps_work);

		I915_WRITE(HWSTAM, 0xeffe);
		if (IS_GEN6(dev)) {
		/* Workaround stalls observed on Sandy Bridge GPUs by
		* making the blitter command streamer generate a
		* write to the Hardware Status Page for
		* MI_USER_INTERRUPT. This appears to serialize the
		* previous seqno write out before the interrupt
		* happens.
		*/
		I915_WRITE(GEN6_BLITTER_HWSTAM, ~GEN6_BLITTER_USER_INTERRUPT);
		}

		/* XXX hotplug from PCH */