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

Revert "msm_fb: display: Copy splash image to kernel memory"

Browse source 
This reverts commit 4b105e60c4e889c4069bf725113a89f3a7d66ced.

Signed-off-by: Iliyan Malchev <malchev@google.com>

Conflicts:
	drivers/video/msm/msm_fb.h
This commit is contained in:
Iliyan Malchev 2013-03-13 14:30:18 -07:00
parent 31c05facd9
commit 24a803537e
5 changed files with 1 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-msm/board-8960-display.c
View file

@ -586,8 +586,6 @@ static struct msm_panel_common_pdata mdp_pdata = {
.mem_hid = MEMTYPE_EBI1,
#endif
.cont_splash_enabled = 0x01,
.splash_screen_addr = 0x00,
.splash_screen_size = 0x00,
.mdp_iommu_split_domain = 0,
};

49
drivers/video/msm/mdp.c
View file

@ -2696,7 +2696,6 @@ static int mdp_probe(struct platform_device *pdev)
struct mipi_panel_info *mipi;
#endif
static int contSplash_update_done;
char *cp;
if ((pdev->id == 0) && (pdev->num_resources > 0)) {
mdp_init_pdev = pdev;
@ -2769,44 +2768,7 @@ static int mdp_probe(struct platform_device *pdev)
if (mdp_pdata) {
if (mdp_pdata->cont_splash_enabled) {
mfd->cont_splash_done = 0;
if (!contSplash_update_done) {
uint32 bpp = 3;
/*read panel wxh and calculate splash screen
size*/
mdp_pdata->splash_screen_size =
inpdw(MDP_BASE + 0x90004);
mdp_pdata->splash_screen_size =
(((mdp_pdata->splash_screen_size >> 16) &
0x00000FFF) * (
mdp_pdata->splash_screen_size &
0x00000FFF)) * bpp;
mdp_pdata->splash_screen_addr =
inpdw(MDP_BASE + 0x90008);
mfd->copy_splash_buf = dma_alloc_coherent(NULL,
mdp_pdata->splash_screen_size,
(dma_addr_t *) &(mfd->copy_splash_phys),
GFP_KERNEL);
if (!mfd->copy_splash_buf) {
pr_err("DMA ALLOC FAILED for SPLASH\n");
return -ENOMEM;
}
cp = (char *)ioremap(
mdp_pdata->splash_screen_addr,
mdp_pdata->splash_screen_size);
if (!cp) {
pr_err("IOREMAP FAILED for SPLASH\n");
return -ENOMEM;
}
memcpy(mfd->copy_splash_buf, cp,
mdp_pdata->splash_screen_size);
MDP_OUTP(MDP_BASE + 0x90008,
mfd->copy_splash_phys);
if (mfd->panel.type == MIPI_VIDEO_PANEL ||
mfd->panel.type == LCDC_PANEL)
mdp_pipe_ctrl(MDP_CMD_BLOCK,
@ -3216,17 +3178,6 @@ void mdp_footswitch_ctrl(boolean on)
mutex_unlock(&mdp_suspend_mutex);
}
void mdp_free_splash_buffer(struct msm_fb_data_type *mfd)
{
if (mfd->copy_splash_buf) {
dma_free_coherent(NULL, mdp_pdata->splash_screen_size,
mfd->copy_splash_buf,
(dma_addr_t) mfd->copy_splash_phys);
mfd->copy_splash_buf = NULL;
}
}
#ifdef CONFIG_PM
static void mdp_suspend_sub(void)
{

2
drivers/video/msm/mdp.h
View file

@ -776,7 +776,7 @@ void mdp_dma3_update(struct msm_fb_data_type *mfd);
int mdp_lcdc_on(struct platform_device *pdev);
int mdp_lcdc_off(struct platform_device *pdev);
void mdp_lcdc_update(struct msm_fb_data_type *mfd);
void mdp_free_splash_buffer(struct msm_fb_data_type *mfd);
#ifdef CONFIG_FB_MSM_MDP303
int mdp_dsi_video_on(struct platform_device *pdev);
int mdp_dsi_video_off(struct platform_device *pdev);

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

@ -2077,9 +2077,6 @@ static int msm_fb_pan_display_sub(struct fb_var_screeninfo *var,
}
}
if (info->node == 0 && (mfd->cont_splash_done)) /* primary */
mdp_free_splash_buffer(mfd);
++mfd->panel_info.frame_count;
return 0;
}
@ -3290,9 +3287,6 @@ static int msmfb_overlay_play(struct fb_info *info, unsigned long *argp)
}
}
if (info->node == 0 && (mfd->cont_splash_done)) /* primary */
mdp_free_splash_buffer(mfd);
return ret;
}

2
drivers/video/msm/msm_fb.h
View file

@ -213,8 +213,6 @@ struct msm_fb_data_type {
void *msm_fb_backup;
boolean panel_driver_on;
int vsync_sysfs_created;
void *copy_splash_buf;
unsigned char *copy_splash_phys;
uint32 sec_mapped;
uint32 sec_active;
};