lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Daniel Vetter
2009-10-04 15:00:36 +02:00
committed by Eric Anholt
parent 1df4b35b61
commit 5c5a4359fe
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/gpu/drm/i915/intel_overlay.c
View File

@@ -286,16 +286,15 @@ static int intel_overlay_wait_flip(struct intel_overlay *overlay)
RING_LOCALS; RING_LOCALS;
if (overlay->last_flip_req != 0) { if (overlay->last_flip_req != 0) {
ret = i915_do_wait_request(dev, overlay->last_flip_req, 0); ret = i915_do_wait_request(dev, overlay->last_flip_req, 1);
if (ret != 0) if (ret == 0) {
return ret; overlay->last_flip_req = 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 */ /* synchronous slowpath */
@@ -439,8 +438,6 @@ int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay,
return ret; return ret;
case SWITCH_OFF_STAGE_2: case SWITCH_OFF_STAGE_2:
printk("switch off 2\n");
BUG_ON(!overlay->vid_bo); BUG_ON(!overlay->vid_bo);
obj = overlay->vid_bo->obj; obj = overlay->vid_bo->obj;