diff options
Diffstat (limited to 'drivers/mfd/glamo/glamo-display.c')
| -rw-r--r-- | drivers/mfd/glamo/glamo-display.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c index f57d273f30c..a5519689476 100644 --- a/drivers/mfd/glamo/glamo-display.c +++ b/drivers/mfd/glamo/glamo-display.c @@ -307,6 +307,7 @@ static int glamo_crtc_mode_set(struct drm_crtc *crtc, printk(KERN_WARNING "[glamo-drm] Display is off - " "enabling it before setting mode.\n"); glamo_lcd_power(gdrm, 1); + msleep(500); } glamo_lcd_cmd_mode(gdrm, 1); @@ -355,14 +356,14 @@ static int glamo_crtc_mode_set(struct drm_crtc *crtc, glamo_lcd_cmd_mode(gdrm, 0); + glamo_crtc_mode_set_base(crtc, 0, 0, old_fb); + if ( mode->hdisplay == 240 ) { - jbt6k74_setresolution(JBT_RESOLUTION_QVGA); + jbt6k74_finish_resolutionchange(JBT_RESOLUTION_QVGA); } else { - jbt6k74_setresolution(JBT_RESOLUTION_VGA); + jbt6k74_finish_resolutionchange(JBT_RESOLUTION_VGA); } - glamo_crtc_mode_set_base(crtc, 0, 0, old_fb); - gcrtc->current_mode = *mode; gcrtc->current_mode_set = 1; gcrtc->current_fb = old_fb; |