drm/msm/mdp: add timeout for irq wait
authorRob Clark <robdclark@gmail.com>
Mon, 24 Mar 2014 13:12:24 +0000 (09:12 -0400)
committerRob Clark <robdclark@gmail.com>
Mon, 31 Mar 2014 14:27:46 +0000 (10:27 -0400)
Make things recover a bit more gracefully if we get stuck with no vblank
irq ever coming.

Signed-off-by: Rob Clark <robdclark@gmail.com>
drivers/gpu/drm/msm/mdp/mdp_kms.c

index 3be48f7c36beafa362a90f1c6c631848806779cf..03455b64a2458e28fdcdb724c42865f6280001de 100644 (file)
@@ -101,7 +101,8 @@ void mdp_irq_wait(struct mdp_kms *mdp_kms, uint32_t irqmask)
                .count = 1,
        };
        mdp_irq_register(mdp_kms, &wait.irq);
-       wait_event(wait_event, (wait.count <= 0));
+       wait_event_timeout(wait_event, (wait.count <= 0),
+                       msecs_to_jiffies(100));
        mdp_irq_unregister(mdp_kms, &wait.irq);
 }