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

msm: board: remove writeback memory from framebuffer

Browse Source 
The memory is allocated on the driver side, board side allocation is
not needed any more.

Change-Id: Id675e5f8420aa82b904d057be0818ed017509869
Signed-off-by: Huaibin Yang <huaibiny@codeaurora.org>
This commit is contained in:
Huaibin Yang
2011-12-09 00:16:25 -08:00
parent 910183691e
commit 27634b815c
4 changed files with 2 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
arch/arm/mach-msm/board-8930-display.c
View File

@@ -47,23 +47,12 @@
#define MSM_FB_EXT_BUF_SIZE 0
#endif
#ifdef CONFIG_FB_MSM_OVERLAY_WRITEBACK
/* width x height x 3 bpp x 2 frame buffer */
#define MSM_FB_WRITEBACK_SIZE (1376 * 768 * 3 * 2)
#define MSM_FB_WRITEBACK_OFFSET \
(MSM_FB_PRIM_BUF_SIZE + MSM_FB_EXT_BUF_SIZE)
#else
#define MSM_FB_WRITEBACK_SIZE 0
#define MSM_FB_WRITEBACK_OFFSET 0
#endif
#ifdef CONFIG_FB_MSM_HDMI_AS_PRIMARY
/* 4 bpp x 2 page HDMI case */
#define MSM_FB_SIZE roundup((1920 * 1088 * 4 * 2), 4096)
#else
/* Note: must be multiple of 4096 */
#define MSM_FB_SIZE roundup(MSM_FB_PRIM_BUF_SIZE + MSM_FB_EXT_BUF_SIZE + \
MSM_FB_WRITEBACK_SIZE, 4096)
#define MSM_FB_SIZE roundup(MSM_FB_PRIM_BUF_SIZE + MSM_FB_EXT_BUF_SIZE, 4096)
#endif
#ifdef CONFIG_FB_MSM_OVERLAY0_WRITEBACK
@@ -90,11 +79,6 @@
#define HDMI_PANEL_NAME "hdmi_msm"
#define TVOUT_PANEL_NAME "tvout_msm"
static int writeback_offset(void)
{
return MSM_FB_WRITEBACK_OFFSET;
}
static struct resource msm_fb_resources[] = {
{
.flags = IORESOURCE_DMA,
@@ -451,7 +435,6 @@ static struct msm_panel_common_pdata mdp_pdata = {
.mdp_bus_scale_table = &mdp_bus_scale_pdata,
#endif
.mdp_rev = MDP_REV_42,
.writeback_offset = writeback_offset,
.mdp_writeback_memtype = MEMTYPE_EBI1,
.mdp_writeback_phys = NULL,
};

19
arch/arm/mach-msm/board-8960-display.c
View File

@@ -38,23 +38,12 @@
#define MSM_FB_EXT_BUF_SIZE 0
#endif
#ifdef CONFIG_FB_MSM_OVERLAY0_WRITEBACK
/* width x height x 3 bpp x 2 frame buffer */
#define MSM_FB_WRITEBACK_SIZE (1376 * 768 * 3 * 2)
#define MSM_FB_WRITEBACK_OFFSET \
(MSM_FB_PRIM_BUF_SIZE + MSM_FB_EXT_BUF_SIZE)
#else
#define MSM_FB_WRITEBACK_SIZE 0
#define MSM_FB_WRITEBACK_OFFSET 0
#endif
#ifdef CONFIG_FB_MSM_HDMI_AS_PRIMARY
/* 4 bpp x 2 page HDMI case */
#define MSM_FB_SIZE roundup((1920 * 1088 * 4 * 2), 4096)
#else
/* Note: must be multiple of 4096 */
#define MSM_FB_SIZE roundup(MSM_FB_PRIM_BUF_SIZE + MSM_FB_EXT_BUF_SIZE + \
MSM_FB_WRITEBACK_SIZE, 4096)
#define MSM_FB_SIZE roundup(MSM_FB_PRIM_BUF_SIZE + MSM_FB_EXT_BUF_SIZE, 4096)
#endif
#ifdef CONFIG_FB_MSM_OVERLAY0_WRITEBACK
@@ -81,11 +70,6 @@
#define HDMI_PANEL_NAME "hdmi_msm"
#define TVOUT_PANEL_NAME "tvout_msm"
static int writeback_offset(void)
{
return MSM_FB_WRITEBACK_OFFSET;
}
static struct resource msm_fb_resources[] = {
{
.flags = IORESOURCE_DMA,
@@ -566,7 +550,6 @@ static struct msm_panel_common_pdata mdp_pdata = {
.mdp_bus_scale_table = &mdp_bus_scale_pdata,
#endif
.mdp_rev = MDP_REV_42,
.writeback_offset = writeback_offset,
.mdp_writeback_memtype = MEMTYPE_EBI1,
.mdp_writeback_phys = NULL,
};

17
arch/arm/mach-msm/board-msm8x60.c
View File

@@ -2627,23 +2627,12 @@ static void __init msm8x60_init_dsps(void)
#define MSM_FB_EXT_BUFT_SIZE 0
#endif
#ifdef CONFIG_FB_MSM_OVERLAY0_WRITEBACK
/* width x height x 3 bpp x 2 frame buffer */
#define MSM_FB_WRITEBACK_SIZE (1024 * 600 * 3 * 2)
#define MSM_FB_WRITEBACK_OFFSET \
(MSM_FB_PRIM_BUF_SIZE + MSM_FB_EXT_BUF_SIZE)
#else
#define MSM_FB_WRITEBACK_SIZE 0
#define MSM_FB_WRITEBACK_OFFSET 0
#endif
#ifdef CONFIG_FB_MSM_HDMI_AS_PRIMARY
/* 4 bpp x 2 page HDMI case */
#define MSM_FB_SIZE roundup((1920 * 1088 * 4 * 2), 4096)
#else
/* Note: must be multiple of 4096 */
#define MSM_FB_SIZE roundup(MSM_FB_PRIM_BUF_SIZE + MSM_FB_EXT_BUF_SIZE + \
MSM_FB_WRITEBACK_SIZE + \
MSM_FB_DSUB_PMEM_ADDER, 4096)
#endif
@@ -2665,11 +2654,6 @@ static void __init msm8x60_init_dsps(void)
#define MSM_FB_OVERLAY1_WRITEBACK_SIZE (0)
#endif /* CONFIG_FB_MSM_OVERLAY1_WRITEBACK */
static int writeback_offset(void)
{
return MSM_FB_WRITEBACK_OFFSET;
}
#define MSM_PMEM_KERNEL_EBI1_SIZE 0x600000
#define MSM_PMEM_ADSP_SIZE 0x2000000
#define MSM_PMEM_AUDIO_SIZE 0x28B000
@@ -9436,7 +9420,6 @@ static struct msm_panel_common_pdata mdp_pdata = {
.mdp_bus_scale_table = &mdp_bus_scale_pdata,
#endif
.mdp_rev = MDP_REV_41,
.writeback_offset = writeback_offset,
.mdp_writeback_memtype = MEMTYPE_EBI1,
.mdp_writeback_phys = NULL,
};

1
arch/arm/mach-msm/include/mach/board.h
View File

@@ -311,7 +311,6 @@ struct msm_panel_common_pdata {
struct msm_bus_scale_pdata *mdp_bus_scale_table;
#endif
int mdp_rev;
int (*writeback_offset)(void);
int mdp_writeback_memtype;
void *mdp_writeback_phys; /* writeback physical addr */
int mdp_writeback_size_ov0; /* overlay0 writeback size */