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

Commit 5c5a4359 authored by Daniel Vetter's avatar Daniel Vetter Committed by Eric Anholt
Browse files

drm/i915: overlay: kill one more unnecessary uninterruptible sleep 



I've simply overlooked one case in the conversion to interruptible
sleeps. Rectify this.

Also delete a leftover debug printk.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 1df4b35b

drivers/gpu/drm/i915/intel_overlay.c

+7 −10
Original line number Diff line number Diff line
@@ -286,10 +286,8 @@ static int intel_overlay_wait_flip(struct intel_overlay *overlay) 
	RING_LOCALS;



	if (overlay->last_flip_req != 0) {

		ret = i915_do_wait_request(dev, overlay->last_flip_req, 0);

		if (ret != 0)

			return ret;



		ret = i915_do_wait_request(dev, overlay->last_flip_req, 1);

		if (ret == 0) {

			overlay->last_flip_req = 0;



			tmp = I915_READ(ISR);
@@ -297,6 +295,7 @@ static int intel_overlay_wait_flip(struct intel_overlay *overlay) 
			if (!(tmp & I915_OVERLAY_PLANE_FLIP_PENDING_INTERRUPT))

				return 0;

		}

	}



	/* synchronous slowpath */

	overlay->hw_wedged = RELEASE_OLD_VID;
@@ -439,8 +438,6 @@ int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay, 
				return ret;



		case SWITCH_OFF_STAGE_2:

			printk("switch off 2\n");



			BUG_ON(!overlay->vid_bo);

			obj = overlay->vid_bo->obj;