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

Commit 19ec1358 authored by Jesse Barnes's avatar Jesse Barnes Committed by Chris Wilson
Browse files

drm/i915: don't check plane vs pipe enable on ILK+ 



These bits have a different meaning on ILK+, where planes are hardwired
to pipes.  Fixing this avoid some spurious assertion failures.

Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent cb3543c6

drivers/gpu/drm/i915/intel_display.c

+4 −0
Original line number Diff line number Diff line
@@ -1225,6 +1225,10 @@ static void assert_planes_disabled(struct drm_i915_private *dev_priv, 
	u32 val;

	int cur_pipe;



	/* Planes are fixed to pipes on ILK+ */

	if (HAS_PCH_SPLIT(dev_priv->dev))

		return;



	/* Need to check both planes against the pipe */

	for (i = 0; i < 2; i++) {

		reg = DSPCNTR(i);