adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

davinci: fb: update the driver in preparation for addition of power management features

Browse source 
Add a helper function to enable raster.  Also add one member in the
private data structure to track the current blank status, another function
pointer which takes in the platform specific callback function to control
panel power.

These updates will help in adding suspend/resume and frame buffer blank
operation features.

Signed-off-by: Chaithrika U S <chaithrika@ti.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Chaithrika U S 2009-12-15 16:46:38 -08:00 committed by Linus Torvalds
parent fa1f136e07
commit 3611380490
2 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
drivers/video/da8xx-fb.c
View file

@ -115,9 +115,11 @@ struct da8xx_fb_par {
unsigned int databuf_sz; unsigned int databuf_sz;
unsigned int palette_sz; unsigned int palette_sz;
unsigned int pxl_clk; unsigned int pxl_clk;
int blank;
#ifdef CONFIG_CPU_FREQ #ifdef CONFIG_CPU_FREQ
struct notifier_block freq_transition; struct notifier_block freq_transition;
#endif #endif
void (*panel_power_ctrl)(int);
}; };
/* Variable Screen Information */ /* Variable Screen Information */
@ -195,8 +197,18 @@ static struct da8xx_panel known_lcd_panels[] = {
}, },
}; };
/* Enable the Raster Engine of the LCD Controller */
static inline void lcd_enable_raster(void)
{
u32 reg;
reg = lcdc_read(LCD_RASTER_CTRL_REG);
if (!(reg & LCD_RASTER_ENABLE))
lcdc_write(reg | LCD_RASTER_ENABLE, LCD_RASTER_CTRL_REG);
}
/* Disable the Raster Engine of the LCD Controller */ /* Disable the Raster Engine of the LCD Controller */
static void lcd_disable_raster(struct da8xx_fb_par *par) static inline void lcd_disable_raster(void)
{ {
u32 reg; u32 reg;
@ -448,8 +460,7 @@ static int fb_setcolreg(unsigned regno, unsigned red, unsigned green,
static void lcd_reset(struct da8xx_fb_par *par) static void lcd_reset(struct da8xx_fb_par *par)
{ {
/* Disable the Raster if previously Enabled */ /* Disable the Raster if previously Enabled */
if (lcdc_read(LCD_RASTER_CTRL_REG) & LCD_RASTER_ENABLE) lcd_disable_raster();
lcd_disable_raster(par);
/* DMA has to be disabled */ /* DMA has to be disabled */
lcdc_write(0, LCD_DMA_CTRL_REG); lcdc_write(0, LCD_DMA_CTRL_REG);
@ -529,13 +540,11 @@ static int lcd_init(struct da8xx_fb_par *par, const struct lcd_ctrl_config *cfg,
static irqreturn_t lcdc_irq_handler(int irq, void *arg) static irqreturn_t lcdc_irq_handler(int irq, void *arg)
{ {
u32 stat = lcdc_read(LCD_STAT_REG); u32 stat = lcdc_read(LCD_STAT_REG);
u32 reg;
if ((stat & LCD_SYNC_LOST) && (stat & LCD_FIFO_UNDERFLOW)) { if ((stat & LCD_SYNC_LOST) && (stat & LCD_FIFO_UNDERFLOW)) {
reg = lcdc_read(LCD_RASTER_CTRL_REG); lcd_disable_raster();
lcdc_write(reg & ~LCD_RASTER_ENABLE, LCD_RASTER_CTRL_REG);
lcdc_write(stat, LCD_STAT_REG); lcdc_write(stat, LCD_STAT_REG);
lcdc_write(reg | LCD_RASTER_ENABLE, LCD_RASTER_CTRL_REG); lcd_enable_raster();
} else } else
lcdc_write(stat, LCD_STAT_REG); lcdc_write(stat, LCD_STAT_REG);
@ -595,16 +604,13 @@ static int lcd_da8xx_cpufreq_transition(struct notifier_block *nb,
unsigned long val, void *data) unsigned long val, void *data)
{ {
struct da8xx_fb_par *par; struct da8xx_fb_par *par;
unsigned int reg;
par = container_of(nb, struct da8xx_fb_par, freq_transition); par = container_of(nb, struct da8xx_fb_par, freq_transition);
if (val == CPUFREQ_PRECHANGE) { if (val == CPUFREQ_PRECHANGE) {
reg = lcdc_read(LCD_RASTER_CTRL_REG); lcd_disable_raster();
lcdc_write(reg & ~LCD_RASTER_ENABLE, LCD_RASTER_CTRL_REG);
} else if (val == CPUFREQ_POSTCHANGE) { } else if (val == CPUFREQ_POSTCHANGE) {
lcd_calc_clk_divider(par); lcd_calc_clk_divider(par);
reg = lcdc_read(LCD_RASTER_CTRL_REG); lcd_enable_raster();
lcdc_write(reg | LCD_RASTER_ENABLE, LCD_RASTER_CTRL_REG);
} }
return 0; return 0;
@ -635,8 +641,10 @@ static int __devexit fb_remove(struct platform_device *dev)
#ifdef CONFIG_CPU_FREQ #ifdef CONFIG_CPU_FREQ
lcd_da8xx_cpufreq_deregister(par); lcd_da8xx_cpufreq_deregister(par);
#endif #endif
if (lcdc_read(LCD_RASTER_CTRL_REG) & LCD_RASTER_ENABLE) if (par->panel_power_ctrl)
lcd_disable_raster(par); par->panel_power_ctrl(0);
lcd_disable_raster();
lcdc_write(0, LCD_RASTER_CTRL_REG); lcdc_write(0, LCD_RASTER_CTRL_REG);
/* disable DMA */ /* disable DMA */
@ -777,6 +785,10 @@ static int __init fb_probe(struct platform_device *device)
par = da8xx_fb_info->par; par = da8xx_fb_info->par;
par->lcdc_clk = fb_clk; par->lcdc_clk = fb_clk;
par->pxl_clk = lcdc_info->pxl_clk; par->pxl_clk = lcdc_info->pxl_clk;
if (fb_pdata->panel_power_ctrl) {
par->panel_power_ctrl = fb_pdata->panel_power_ctrl;
par->panel_power_ctrl(1);
}
if (lcd_init(par, lcd_cfg, lcdc_info) < 0) { if (lcd_init(par, lcd_cfg, lcdc_info) < 0) {
dev_err(&device->dev, "lcd_init failed\n"); dev_err(&device->dev, "lcd_init failed\n");
@ -877,8 +889,7 @@ static int __init fb_probe(struct platform_device *device)
#endif #endif
/* enable raster engine */ /* enable raster engine */
lcdc_write(lcdc_read(LCD_RASTER_CTRL_REG) | lcd_enable_raster();
LCD_RASTER_ENABLE, LCD_RASTER_CTRL_REG);
return 0; return 0;

1
include/video/da8xx-fb.h
View file

@ -38,6 +38,7 @@ struct da8xx_lcdc_platform_data {
const char manu_name[10]; const char manu_name[10];
void *controller_data; void *controller_data;
const char type[25]; const char type[25];
void (*panel_power_ctrl)(int);
}; };
struct lcd_ctrl_config { struct lcd_ctrl_config {