diff options
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) | |||
572 | /* PM code called only in internal controller mode */ | 572 | /* PM code called only in internal controller mode */ |
573 | static void omap_lcdc_suspend(void) | 573 | static void omap_lcdc_suspend(void) |
574 | { | 574 | { |
575 | if (lcdc.update_mode == OMAPFB_AUTO_UPDATE) { | 575 | omap_lcdc_set_update_mode(OMAPFB_UPDATE_DISABLED); |
576 | disable_controller(); | ||
577 | omap_stop_lcd_dma(); | ||
578 | } | ||
579 | } | 576 | } |
580 | 577 | ||
581 | static void omap_lcdc_resume(void) | 578 | static void omap_lcdc_resume(void) |
582 | { | 579 | { |
583 | if (lcdc.update_mode == OMAPFB_AUTO_UPDATE) { | 580 | omap_lcdc_set_update_mode(OMAPFB_AUTO_UPDATE); |
584 | setup_regs(); | ||
585 | load_palette(); | ||
586 | setup_lcd_dma(); | ||
587 | set_load_mode(OMAP_LCDC_LOAD_FRAME); | ||
588 | enable_irqs(OMAP_LCDC_IRQ_DONE); | ||
589 | enable_controller(); | ||
590 | } | ||
591 | } | 581 | } |
592 | 582 | ||
593 | static void omap_lcdc_get_caps(int plane, struct omapfb_caps *caps) | 583 | static void omap_lcdc_get_caps(int plane, struct omapfb_caps *caps) |