diff options
| author | Linus Torvalds | 2010-06-27 07:36:16 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2010-06-27 07:36:16 -0700 |
| commit | 7f607455c3b91fec267c48a4177526cbb5e501f4 (patch) | |
| tree | 8557e1e217c9d20f2f43cd40e1c47d6ee549db9b /drivers/video/omap/lcdc.c | |
| parent | be1d29f59ca3ec7dfbbae24d4f68d357f5a31c4b (diff) | |
| parent | bc092a303a1b980c67324920471e23354b0721cd (diff) | |
Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux:
OMAP: OMAPFB: fix rfbi.c compile error
OMAPFB: LCDC: change update_mode to DISABLED when going suspend
Diffstat (limited to 'drivers/video/omap/lcdc.c')
| -rw-r--r-- | drivers/video/omap/lcdc.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c index 43ab7d8b66b2..7767338f8b14 100644 --- a/drivers/video/omap/lcdc.c +++ b/drivers/video/omap/lcdc.c @@ -572,22 +572,12 @@ static enum omapfb_update_mode omap_lcdc_get_update_mode(void) /* PM code called only in internal controller mode */ static void omap_lcdc_suspend(void) { - if (lcdc.update_mode == OMAPFB_AUTO_UPDATE) { - disable_controller(); - omap_stop_lcd_dma(); - } + omap_lcdc_set_update_mode(OMAPFB_UPDATE_DISABLED); } static void omap_lcdc_resume(void) { - if (lcdc.update_mode == OMAPFB_AUTO_UPDATE) { - setup_regs(); - load_palette(); - setup_lcd_dma(); - set_load_mode(OMAP_LCDC_LOAD_FRAME); - enable_irqs(OMAP_LCDC_IRQ_DONE); - enable_controller(); - } + omap_lcdc_set_update_mode(OMAPFB_AUTO_UPDATE); } static void omap_lcdc_get_caps(int plane, struct omapfb_caps *caps) |