diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2009-07-01 23:10:25 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2009-07-01 23:10:25 +0100 |
| commit | d3ae4ce3ee964940be32f0d19081256b26796c45 (patch) | |
| tree | 6e1dbd8cde42b30f301bb44f53240d2273283f21 /drivers/mfd/glamo/glamo-display.c | |
| parent | f7d411ee185c7b992e9f95b512489892e8f7c30d (diff) | |
Fix scanout timings
This fixes the scanout timing conversion so that it works.
Signed-off-by: Thomas White <taw@bitwiz.org.uk>
Diffstat (limited to 'drivers/mfd/glamo/glamo-display.c')
| -rw-r--r-- | drivers/mfd/glamo/glamo-display.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c index 8842c3ed267..15b20e37579 100644 --- a/drivers/mfd/glamo/glamo-display.c +++ b/drivers/mfd/glamo/glamo-display.c @@ -310,7 +310,7 @@ static void glamo_crtc_mode_set(struct drm_crtc *crtc, { struct glamodrm_handle *gdrm; struct glamo_crtc *gcrtc; - int retr_end, disp_start, disp_end; + int retr_start, retr_end, disp_start, disp_end; printk(KERN_CRIT "glamo_crtc_mode_set\n"); @@ -329,13 +329,14 @@ static void glamo_crtc_mode_set(struct drm_crtc *crtc, GLAMO_LCD_PITCH_MASK, mode->hdisplay*2); /* Convert "X modeline timings" into "Glamo timings" */ - retr_end = mode->hsync_end - mode->hsync_start; + retr_start = 0; + retr_end = retr_start + mode->hsync_end - mode->hsync_start; disp_start = mode->htotal - mode->hsync_start; - disp_end = mode->hsync_start; + disp_end = disp_start + mode->hdisplay; reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_TOTAL, GLAMO_LCD_HV_TOTAL_MASK, mode->htotal); reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_START, - GLAMO_LCD_HV_RETR_START_MASK, 0); + GLAMO_LCD_HV_RETR_START_MASK, retr_start); reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_END, GLAMO_LCD_HV_RETR_END_MASK, retr_end); reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_START, @@ -344,13 +345,14 @@ static void glamo_crtc_mode_set(struct drm_crtc *crtc, GLAMO_LCD_HV_RETR_DISP_END_MASK, disp_end); /* The same in the vertical direction */ - retr_end = mode->vsync_end - mode->vsync_start; + retr_start = 0; + retr_end = retr_start + mode->vsync_end - mode->vsync_start; disp_start = mode->vtotal - mode->vsync_start; - disp_end = mode->vsync_start; + disp_end = disp_start + mode->vdisplay; reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_TOTAL, GLAMO_LCD_HV_TOTAL_MASK, mode->vtotal); reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_START, - GLAMO_LCD_HV_RETR_START_MASK, 0); + GLAMO_LCD_HV_RETR_START_MASK, retr_start); reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_END, GLAMO_LCD_HV_RETR_END_MASK, retr_end); reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_START, @@ -459,15 +461,13 @@ static int glamo_connector_get_modes(struct drm_connector *connector) mode->hdisplay = mach_info->xres.defval; mode->hsync_start = mach_info->right_margin + mode->hdisplay; mode->hsync_end = mode->hsync_start + mach_info->hsync_len; - mode->htotal = mode->hdisplay + mach_info->left_margin - + mach_info->right_margin + mach_info->hsync_len; - + mode->htotal = mode->hsync_end + mach_info->left_margin; mode->hskew = 0; + mode->vdisplay = mach_info->yres.defval; mode->vsync_start = mach_info->lower_margin + mode->vdisplay; mode->vsync_end = mode->vsync_start + mach_info->vsync_len; - mode->vtotal = mode->vdisplay + mach_info->upper_margin - + mach_info->lower_margin + mach_info->vsync_len; + mode->vtotal = mode->vsync_end + mach_info->upper_margin; mode->vscan = 0; mode->width_mm = mach_info->width; |