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

Commit 7feb8b88 authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter
Browse files

drm/i915/skl: Adjust assert_sprites_disabled() 



Let's put to good use the new PLANE_CTL macros.

Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent dc2a41b4

drivers/gpu/drm/i915/intel_display.c

+8 −1
Original line number Diff line number Diff line
@@ -1335,7 +1335,14 @@ static void assert_sprites_disabled(struct drm_i915_private *dev_priv, 
	int reg, sprite;

	u32 val;



	if (IS_VALLEYVIEW(dev)) {

	if (INTEL_INFO(dev)->gen >= 9) {

		for_each_sprite(pipe, sprite) {

			val = I915_READ(PLANE_CTL(pipe, sprite));

			WARN(val & PLANE_CTL_ENABLE,

			     "plane %d assertion failure, should be off on pipe %c but is still active\n",

			     sprite, pipe_name(pipe));

		}

	} else if (IS_VALLEYVIEW(dev)) {

		for_each_sprite(pipe, sprite) {

			reg = SPCNTR(pipe, sprite);

			val = I915_READ(reg);