Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

msm_fb: Check for panel power on after Unblank.

Browse source 
In Overlay_play , panel power on check was at wrong place
it has to be after Unblank.

Change-Id: If910f83ef57499b5f771bc7d3d1bdfa814d5c019
Signed-off-by: Kalyan Thota <kalyant@codeaurora.org>
This commit is contained in:
Kalyan Thota 2013-01-29 14:28:30 -08:00 committed by Iliyan Malchev
parent 8f0bf4cc1e
commit bad23eecf7
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/video/msm/msm_fb.c
View file

@ -3173,9 +3173,6 @@ static int msmfb_overlay_play(struct fb_info *info, unsigned long *argp)
struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par; struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
struct msm_fb_panel_data *pdata; struct msm_fb_panel_data *pdata;
if (!mfd->panel_power_on) /* suspended */
return -EPERM;
if (mfd->overlay_play_enable == 0) /* nothing to do */ if (mfd->overlay_play_enable == 0) /* nothing to do */
return 0; return 0;
@ -3186,6 +3183,17 @@ static int msmfb_overlay_play(struct fb_info *info, unsigned long *argp)
return ret; return ret;
} }
if (info->node == 0 && !(mfd->cont_splash_done)) { /* primary */
mdp_set_dma_pan_info(info, NULL, TRUE);
if (msm_fb_blank_sub(FB_BLANK_UNBLANK, info, mfd->op_enable)) {
pr_err("%s: can't turn on display!\n", __func__);
return -EINVAL;
}
}
if (!mfd->panel_power_on) /* suspended */
return -EPERM;
complete(&mfd->msmfb_update_notify); complete(&mfd->msmfb_update_notify);
mutex_lock(&msm_fb_notify_update_sem); mutex_lock(&msm_fb_notify_update_sem);
if (mfd->msmfb_no_update_notify_timer.function) if (mfd->msmfb_no_update_notify_timer.function)
@ -3195,14 +3203,6 @@ static int msmfb_overlay_play(struct fb_info *info, unsigned long *argp)
add_timer(&mfd->msmfb_no_update_notify_timer); add_timer(&mfd->msmfb_no_update_notify_timer);
mutex_unlock(&msm_fb_notify_update_sem); mutex_unlock(&msm_fb_notify_update_sem);
if (info->node == 0 && !(mfd->cont_splash_done)) { /* primary */
mdp_set_dma_pan_info(info, NULL, TRUE);
if (msm_fb_blank_sub(FB_BLANK_UNBLANK, info, mfd->op_enable)) {
pr_err("%s: can't turn on display!\n", __func__);
return -EINVAL;
}
}
ret = mdp4_overlay_play(info, &req); ret = mdp4_overlay_play(info, &req);
if (unset_bl_level && !bl_updated) { if (unset_bl_level && !bl_updated) {