--- 405230f5543f37f26184ee62729decd7457b705b +++ 39807a981930c7c4b50657d9ce65e0ad298b221b @@ -638,10 +638,9 @@ void mdp4_overlay_dmae_xy(struct mdp4_ov int mdp4_overlay_pipe_staged(int mixer); void mdp4_lcdc_primary_vsyn(void); void mdp4_overlay0_done_lcdc(int cndx); -void mdp4_overlay0_done_mddi(int cndx); +void mdp4_overlay0_done_mddi(struct mdp_dma_data *dma); void mdp4_dma_p_done_mddi(struct mdp_dma_data *dma); void mdp4_dmap_done_dsi_cmd(int cndx); -void mdp4_dmap_done_mddi(int cndx); void mdp4_dmap_done_dsi_video(int cndx); void mdp4_dmap_done_lcdc(int cndx); void mdp4_overlay1_done_dtv(void); @@ -727,12 +726,6 @@ void mdp4_dsi_cmd_overlay_blt(struct msm void mdp4_dsi_video_overlay_blt(struct msm_fb_data_type *mfd, struct msmfb_overlay_blt *req); void mdp4_dsi_video_base_swap(int cndx, struct mdp4_overlay_pipe *pipe); -static inline void mdp4_mddi_blt_start(struct msm_fb_data_type *mfd) -{ -} -static inline void mdp4_mddi_blt_stop(struct msm_fb_data_type *mfd) -{ -} #ifdef CONFIG_FB_MSM_MDP40 static inline void mdp3_dsi_cmd_dma_busy_wait(struct msm_fb_data_type *mfd) @@ -741,8 +734,6 @@ static inline void mdp3_dsi_cmd_dma_busy } #endif #else /* CONFIG_FB_MSM_MIPI_DSI */ -void mdp4_mddi_blt_start(struct msm_fb_data_type *mfd); -void mdp4_mddi_blt_stop(struct msm_fb_data_type *mfd); int mdp4_mddi_overlay_blt_offset(struct msm_fb_data_type *mfd, struct msmfb_overlay_blt *req); void mdp4_mddi_overlay_blt(struct msm_fb_data_type *mfd, @@ -750,7 +741,6 @@ void mdp4_mddi_overlay_blt(struct msm_fb int mdp4_mddi_overlay_blt_start(struct msm_fb_data_type *mfd); int mdp4_mddi_overlay_blt_stop(struct msm_fb_data_type *mfd); void mdp4_mddi_blt_dmap_busy_wait(struct msm_fb_data_type *mfd); -void mdp4_mddi_rdptr_init(int cndx); static inline int mdp4_dsi_overlay_blt_start(struct msm_fb_data_type *mfd) { return -ENODEV; @@ -787,14 +777,6 @@ static inline void mdp4_dsi_video_base_s { /* empty */ } -static inline void mdp4_dsi_cmd_blt_start(struct msm_fb_data_type *mfd) -{ - /* empty */ -} -static inline void mdp4_dsi_cmd_blt_stop(struct msm_fb_data_type *mfd) -{ - /* empty */ -} #endif /* CONFIG_FB_MSM_MIPI_DSI */ void mdp4_lcdc_overlay_blt(struct msm_fb_data_type *mfd, @@ -841,35 +823,11 @@ static inline void mdp4_dsi_cmd_del_time { /* empty */ } -#else /* CONFIG_FB_MSM_MDP303 */ +#else /* CONFIG_FB_MSM_MIPI_DSI */ void mdp4_dsi_cmd_del_timer(void); -static inline int mdp4_mddi_on(struct platform_device *pdev) -{ - return 0; -} -static inline int mdp4_mddi_off(struct platform_device *pdev) -{ - return 0; -} -static inline void mdp4_mddi_wait4vsync(int cndx, long long *vtime) -{ -} -static inline void mdp4_mddi_vsync_ctrl(struct fb_info *info, int enable) -{ -} -static inline void mdp4_mddi_pipe_queue(int cndx, - struct mdp4_overlay_pipe *pipe) -{ -} #endif #else /* CONFIG_FB_MSM_MIPI_DSI */ -int mdp4_mddi_off(struct platform_device *pdev); -int mdp4_mddi_on(struct platform_device *pdev); -void mdp4_mddi_wait4vsync(int cndx, long long *vtime); -void mdp4_mddi_vsync_ctrl(struct fb_info *info, int enable); -void mdp4_mddi_pipe_queue(int cndx, struct mdp4_overlay_pipe *pipe); - static inline int mdp4_dsi_cmd_on(struct platform_device *pdev) { return 0; @@ -908,7 +866,7 @@ static inline void mdp4_dsi_video_pipe_q { } static inline void mdp4_dsi_cmd_vsync_ctrl(struct fb_info *info, - int enable) + int enable) { } static inline void mdp4_dsi_video_vsync_ctrl(struct fb_info *info, @@ -994,7 +952,7 @@ void mdp4_csc_write(struct mdp_csc_cfg * int mdp4_csc_enable(struct mdp_csc_cfg_data *config); int mdp4_pcc_cfg(struct mdp_pcc_cfg_data *cfg_ptr); int mdp4_argc_cfg(struct mdp_pgc_lut_data *pgc_ptr); -int mdp4_qseed_cfg(struct mdp_qseed_cfg_data *cfg); + u32 mdp4_allocate_writeback_buf(struct msm_fb_data_type *mfd, u32 mix_num); void mdp4_init_writeback_buf(struct msm_fb_data_type *mfd, u32 mix_num); void mdp4_free_writeback_buf(struct msm_fb_data_type *mfd, u32 mix_num);