From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carl Vanderlip Subject: [PATCH 3/4] [ARM] msm_fb: Fix framebuffer console Date: Wed, 2 Mar 2011 13:17:51 -0800 Message-ID: <1299100671-11665-1-git-send-email-carlv@codeaurora.org> References: <1299100542-11120-1-git-send-email-carlv@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <1299100542-11120-1-git-send-email-carlv@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org To: David Brown , Daniel Walker , Bryan Huntsman David Brown Daniel Walker Bryan Huntsman Cc: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Carl Vanderlip , "open list:FRAMEBUFFER LAYER" List-Id: linux-arm-msm@vger.kernel.org =46rom: Arve Hj=C3=B8nnev=C3=A5g Don't allow non panning updates to bypass the wait for the panel to tur= n on. Signed-off-by: Carl Vanderlip --- 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 fe5efe5..ec35130 100644 --- a/drivers/video/msm/msm_fb.c +++ b/drivers/video/msm/msm_fb.c @@ -219,8 +219,8 @@ restart: =20 sleeping =3D msmfb->sleeping; /* on a full update, if the last frame has not completed, wait for it= */ - if (pan_display && (msmfb->frame_requested !=3D msmfb->frame_done || - sleeping =3D=3D UPDATING)) { + if ((pan_display && msmfb->frame_requested !=3D msmfb->frame_done) || + sleeping =3D=3D UPDATING) { int ret; spin_unlock_irqrestore(&msmfb->update_lock, irq_flags); ret =3D wait_event_interruptible_timeout(msmfb->frame_wq, --=20 Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora For= um.