diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-04-04 08:03:21 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-04-04 08:03:21 +1000 |
| commit | 2614dc66837c2a6fd0e14e3f8e72343782c8b784 (patch) | |
| tree | add8d8f2394ab8bc696ca787bf2c14ef45a88297 /drivers/gpu/drm/msm/mdp | |
| parent | d9961b22716ddf59ca307fe862f93ff0ea919952 (diff) | |
| parent | 06fb220b2d1a80be5621fa06ef276a3890e6be78 (diff) | |
Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm-next
* 'msm-next' of git://people.freedesktop.org/~robclark/linux:
drm/omap: Don't dereference list head when the connectors list is empty
drm/msm/mdp: add timeout for irq wait
drm/msm: validate flags, etc
drm/msm: use componentised device support
drm/msm: add chip-id param
drm/msm: crank down gpu when inactive
drm/msm: spin helper
drm/msm: add hang_debug module param
drm/msm: hdmi audio support
Diffstat (limited to 'drivers/gpu/drm/msm/mdp')
| -rw-r--r-- | drivers/gpu/drm/msm/mdp/mdp_kms.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/mdp/mdp_kms.c b/drivers/gpu/drm/msm/mdp/mdp_kms.c index 3be48f7c36b..03455b64a24 100644 --- a/drivers/gpu/drm/msm/mdp/mdp_kms.c +++ b/drivers/gpu/drm/msm/mdp/mdp_kms.c @@ -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); } |