diff options
| author | Arve Hjønnevåg <arve@android.com> | 2011-03-02 16:17:51 -0500 |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2011-03-08 14:54:23 -0500 |
| commit | 5d55779a5d95acdaa1080f1a4806fd6d4984d1e4 (patch) | |
| tree | 2bb8f1142bea270b13209e6fa3aca9bc52334d16 | |
| parent | a8d380f30a7d8cc507fd5cc84b2dc5ee2b2144d7 (diff) | |
msm_fb: Fix framebuffer console
Don't allow non panning updates to bypass the wait for the panel to turn on.
Signed-off-by: Carl Vanderlip <carlv@codeaurora.org>
Signed-off-by: Arve Hjønnevåg <arve@android.com>
Signed-off-by: David Brown <davidb@codeaurora.org>
| -rw-r--r-- | drivers/video/msm/msm_fb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/msm/msm_fb.c b/drivers/video/msm/msm_fb.c index fe5efe59d5c5..ec351309e607 100644 --- a/drivers/video/msm/msm_fb.c +++ b/drivers/video/msm/msm_fb.c | |||
| @@ -219,8 +219,8 @@ restart: | |||
| 219 | 219 | ||
| 220 | sleeping = msmfb->sleeping; | 220 | sleeping = msmfb->sleeping; |
| 221 | /* on a full update, if the last frame has not completed, wait for it */ | 221 | /* on a full update, if the last frame has not completed, wait for it */ |
| 222 | if (pan_display && (msmfb->frame_requested != msmfb->frame_done || | 222 | if ((pan_display && msmfb->frame_requested != msmfb->frame_done) || |
| 223 | sleeping == UPDATING)) { | 223 | sleeping == UPDATING) { |
| 224 | int ret; | 224 | int ret; |
| 225 | spin_unlock_irqrestore(&msmfb->update_lock, irq_flags); | 225 | spin_unlock_irqrestore(&msmfb->update_lock, irq_flags); |
| 226 | ret = wait_event_interruptible_timeout(msmfb->frame_wq, | 226 | ret = wait_event_interruptible_timeout(msmfb->frame_wq, |