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: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Eric Anholt <eric@anholt.net>

1 files changed, 7 insertions, 10 deletions

diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index 972d715245be..f1bf0b0c204c 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -286,16 +286,15 @@ 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;
-
-                overlay->last_flip_req = 0;
+                ret = i915_do_wait_request(dev, overlay->last_flip_req, 1);
+                if (ret == 0) {
+                        overlay->last_flip_req = 0;
 
-                tmp = I915_READ(ISR);
+                        tmp = I915_READ(ISR);
 
-                if (!(tmp & I915_OVERLAY_PLANE_FLIP_PENDING_INTERRUPT))
-                        return 0;
+                        if (!(tmp & I915_OVERLAY_PLANE_FLIP_PENDING_INTERRUPT))
+                                return 0;
+                }
         }
 
         /* synchronous slowpath */
@@ -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;