summaryrefslogtreecommitdiff
path: root/drivers/video/msm
diff options
context:
space:
mode:
authorArve Hjønnevåg <arve@android.com>2011-03-03 00:17:51 +0300
committerDavid Brown <davidb@codeaurora.org>2011-03-08 22:54:23 +0300
commit5d55779a5d95acdaa1080f1a4806fd6d4984d1e4 (patch)
tree2bb8f1142bea270b13209e6fa3aca9bc52334d16 /drivers/video/msm
parenta8d380f30a7d8cc507fd5cc84b2dc5ee2b2144d7 (diff)
downloadlinux-5d55779a5d95acdaa1080f1a4806fd6d4984d1e4.tar.xz
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>
Diffstat (limited to 'drivers/video/msm')
-rw-r--r--drivers/video/msm/msm_fb.c4
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:
sleeping = msmfb->sleeping;
/* on a full update, if the last frame has not completed, wait for it */
- if (pan_display && (msmfb->frame_requested != msmfb->frame_done ||
- sleeping == UPDATING)) {
+ if ((pan_display && msmfb->frame_requested != msmfb->frame_done) ||
+ sleeping == UPDATING) {
int ret;
spin_unlock_irqrestore(&msmfb->update_lock, irq_flags);
ret = wait_event_interruptible_timeout(msmfb->frame_wq,