Commit a7f08958 authored by Keith Packard's avatar Keith Packard
Browse files

Merge branch 'drm-intel-fixes' into drm-intel-next

parents bee4d4ac 2b1ecb73

drivers/gpu/drm/i915/i915_irq.c

+1 −1
Original line number Diff line number Diff line
@@ -1745,7 +1745,7 @@ static 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)) {

	if (IS_GEN6(dev) || IS_GEN7(dev)) {

		/* Workaround stalls observed on Sandy Bridge GPUs by

		 * making the blitter command streamer generate a

		 * write to the Hardware Status Page for

CRA Git | Maintained and supported by SUSTech CRA and CCSE