DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mdp4_overlay: only call dtv stuff when config'd

Browse Source
This commit is contained in:
James Sullins
2012-01-25 10:46:49 -06:00
parent a589e4011f
commit d0510db61a
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/video/msm/mdp4_overlay.c
View File

@@ -2217,9 +2217,11 @@ int mdp4_overlay_set(struct fb_info *info, struct mdp_overlay *req)
mdp4_overlay_status_write(MDP4_OVERLAY_TYPE_SET, true); mdp4_overlay_status_write(MDP4_OVERLAY_TYPE_SET, true);
} }
#ifdef CONFIG_FB_MSM_DTV
if (ctrl->panel_mode & MDP4_PANEL_DTV && if (ctrl->panel_mode & MDP4_PANEL_DTV &&
pipe->mixer_num == MDP4_MIXER1) pipe->mixer_num == MDP4_MIXER1)
mdp4_overlay_dtv_set(mfd, pipe); mdp4_overlay_dtv_set(mfd, pipe);
#endif
if (new_perf_level != perf_level) { if (new_perf_level != perf_level) {
u32 old_level = new_perf_level; u32 old_level = new_perf_level;
@@ -2241,10 +2243,13 @@ int mdp4_overlay_set(struct fb_info *info, struct mdp_overlay *req)
mdp4_mddi_dma_busy_wait(mfd); mdp4_mddi_dma_busy_wait(mfd);
mdp4_set_perf_level(); mdp4_set_perf_level();
} }
} else { }
#ifdef CONFIG_FB_MSM_DTV
else {
if (ctrl->panel_mode & MDP4_PANEL_DTV) if (ctrl->panel_mode & MDP4_PANEL_DTV)
mdp4_overlay_dtv_ov_done_push(mfd, pipe); mdp4_overlay_dtv_ov_done_push(mfd, pipe);
} }
#endif
} }
mutex_unlock(&mfd->dma->ov_mutex); mutex_unlock(&mfd->dma->ov_mutex);
@@ -2324,10 +2329,13 @@ int mdp4_overlay_unset(struct fb_info *info, int ndx)
mdp4_overlay_update_blt_mode(mfd); mdp4_overlay_update_blt_mode(mfd);
if (!mfd->use_ov0_blt) if (!mfd->use_ov0_blt)
mdp4_free_writeback_buf(mfd, MDP4_MIXER0); mdp4_free_writeback_buf(mfd, MDP4_MIXER0);
} else { /* mixer1, DTV, ATV */ }
#ifdef CONFIG_FB_MSM_DTV
else { /* mixer1, DTV, ATV */
if (ctrl->panel_mode & MDP4_PANEL_DTV) if (ctrl->panel_mode & MDP4_PANEL_DTV)
mdp4_overlay_dtv_unset(mfd, pipe); mdp4_overlay_dtv_unset(mfd, pipe);
} }
#endif
} }
/* Reset any HSIC settings to default */ /* Reset any HSIC settings to default */
@@ -2402,7 +2410,9 @@ int mdp4_overlay_play_wait(struct fb_info *info, struct msmfb_overlay_data *req)
mdp4_mixer_stage_commit(pipe->mixer_num); mdp4_mixer_stage_commit(pipe->mixer_num);
#ifdef CONFIG_FB_MSM_DTV
mdp4_overlay_dtv_wait_for_ov(mfd, pipe); mdp4_overlay_dtv_wait_for_ov(mfd, pipe);
#endif
mutex_unlock(&mfd->dma->ov_mutex); mutex_unlock(&mfd->dma->ov_mutex);
return 0; return 0;
@@ -2568,8 +2578,10 @@ int mdp4_overlay_play(struct fb_info *info, struct msmfb_overlay_data *req)
} else if (pipe->mixer_num == MDP4_MIXER1) { } else if (pipe->mixer_num == MDP4_MIXER1) {
ctrl->mixer1_played++; ctrl->mixer1_played++;
/* enternal interface */ /* enternal interface */
#ifdef CONFIG_FB_MSM_DTV
if (ctrl->panel_mode & MDP4_PANEL_DTV) if (ctrl->panel_mode & MDP4_PANEL_DTV)
mdp4_overlay_dtv_ov_done_push(mfd, pipe); mdp4_overlay_dtv_ov_done_push(mfd, pipe);
#endif
} else { } else {
/* primary interface */ /* primary interface */