lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc: remove support for bootmem-allocated memory for the DIU driver

Browse Source 
Early versions of the Freescale DIU framebuffer driver depended on a bootmem
allocation of memory for the video buffer.  The need for this feature was
removed in commit 6b51d51a, so now we can remove the platform-specific code
that allocated that memory.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Timur Tabi
2008-09-23 09:47:01 -05:00
committed by Kumar Gala
parent 9bd54d185a
commit 43c9f43492
3 changed files with 1 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/powerpc/platforms/86xx/mpc8610_hpcd.c
View File

@@ -238,7 +238,6 @@ static void __init mpc86xx_hpcd_setup_arch(void)
} }
#endif #endif
#if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE) #if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)
preallocate_diu_videomemory();
diu_ops.get_pixel_format = mpc8610hpcd_get_pixel_format; diu_ops.get_pixel_format = mpc8610hpcd_get_pixel_format;
diu_ops.set_gamma_table = mpc8610hpcd_set_gamma_table; diu_ops.set_gamma_table = mpc8610hpcd_set_gamma_table;
diu_ops.set_monitor_port = mpc8610hpcd_set_monitor_port; diu_ops.set_monitor_port = mpc8610hpcd_set_monitor_port;

38
arch/powerpc/sysdev/fsl_soc.c
View File

@@ -720,42 +720,6 @@ void fsl_rstcr_restart(char *cmd)
#endif #endif
#if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE) #if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)
struct platform_diu_data_ops diu_ops = { struct platform_diu_data_ops diu_ops;
.diu_size = 1280 * 1024 * 4, /* default one 1280x1024 buffer */
};
EXPORT_SYMBOL(diu_ops); EXPORT_SYMBOL(diu_ops);
int __init preallocate_diu_videomemory(void)
{
pr_debug("diu_size=%lu\n", diu_ops.diu_size);
diu_ops.diu_mem = __alloc_bootmem(diu_ops.diu_size, 8, 0);
if (!diu_ops.diu_mem) {
printk(KERN_ERR "fsl-diu: cannot allocate %lu bytes\n",
diu_ops.diu_size);
return -ENOMEM;
}
pr_debug("diu_mem=%p\n", diu_ops.diu_mem);
rh_init(&diu_ops.diu_rh_info, 4096, ARRAY_SIZE(diu_ops.diu_rh_block),
diu_ops.diu_rh_block);
return rh_attach_region(&diu_ops.diu_rh_info,
(unsigned long) diu_ops.diu_mem,
diu_ops.diu_size);
}
static int __init early_parse_diufb(char *p)
{
if (!p)
return 1;
diu_ops.diu_size = _ALIGN_UP(memparse(p, &p), 8);
pr_debug("diu_size=%lu\n", diu_ops.diu_size);
return 0;
}
early_param("diufb", early_parse_diufb);
#endif #endif

8
arch/powerpc/sysdev/fsl_soc.h
View File

@@ -20,14 +20,7 @@ extern int fsl_spi_init(struct spi_board_info *board_infos,
extern void fsl_rstcr_restart(char *cmd); extern void fsl_rstcr_restart(char *cmd);
#if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE) #if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)
#include <linux/bootmem.h>
#include <asm/rheap.h>
struct platform_diu_data_ops { struct platform_diu_data_ops {
rh_block_t diu_rh_block[16];
rh_info_t diu_rh_info;
unsigned long diu_size;
void *diu_mem;
unsigned int (*get_pixel_format) (unsigned int bits_per_pixel, unsigned int (*get_pixel_format) (unsigned int bits_per_pixel,
int monitor_port); int monitor_port);
void (*set_gamma_table) (int monitor_port, char *gamma_table_base); void (*set_gamma_table) (int monitor_port, char *gamma_table_base);
@@ -38,7 +31,6 @@ struct platform_diu_data_ops {
}; };
extern struct platform_diu_data_ops diu_ops; extern struct platform_diu_data_ops diu_ops;
int __init preallocate_diu_videomemory(void);
#endif #endif
#endif #endif