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

Commit 3fdef020 authored by Zhenyu Wang's avatar Zhenyu Wang Committed by Eric Anholt
Browse files

drm/i915: fix render pipe control notify on sandybridge 



This one is missed in last pipe control fix for sandybridge,
that really unmask interrupt bit for notify in render engine IMR.

Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 877fdacf

drivers/gpu/drm/i915/i915_irq.c

+6 −1
Original line number Diff line number Diff line
@@ -1381,12 +1381,17 @@ static int ironlake_irq_postinstall(struct drm_device *dev) 
	I915_WRITE(DEIER, dev_priv->de_irq_enable_reg);

	(void) I915_READ(DEIER);



	/* user interrupt should be enabled, but masked initial */

	/* Gen6 only needs render pipe_control now */

	if (IS_GEN6(dev))

		render_mask = GT_PIPE_NOTIFY;



	dev_priv->gt_irq_mask_reg = ~render_mask;

	dev_priv->gt_irq_enable_reg = render_mask;



	I915_WRITE(GTIIR, I915_READ(GTIIR));

	I915_WRITE(GTIMR, dev_priv->gt_irq_mask_reg);

	if (IS_GEN6(dev))

		I915_WRITE(GEN6_RENDER_IMR, ~GEN6_RENDER_PIPE_CONTROL_NOTIFY_INTERRUPT);

	I915_WRITE(GTIER, dev_priv->gt_irq_enable_reg);

	(void) I915_READ(GTIER);