diff options
| author | Archit Taneja <archit@ti.com> | 2012-06-28 18:23:18 +0530 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-06-29 10:15:53 +0300 |
| commit | 23bae3adbf90f8ad537687e1b46b7c87558936ae (patch) | |
| tree | 37fac7f828ce3aa126a81cb07ad899785fb81c86 /drivers/video/omap2/omapfb/omapfb-main.c | |
| parent | 8050cbe4cd9a96ff333df718f38830eabab690bd (diff) | |
OMAPFB: Map interlace field in omap_video_timings with fb vmode flags
Use the interlace field in omap_video_timings to configure/retrieve
corresponding fb mode flags in fb_var_screeninfo and fb_videomode.
The interlace field maps with the fb mode flags FB_VMODE_INTERLACED and
FB_VMODE_NONINTERLACED.
Signed-off-by: Archit Taneja <archit@ti.com>
Diffstat (limited to 'drivers/video/omap2/omapfb/omapfb-main.c')
| -rw-r--r-- | drivers/video/omap2/omapfb/omapfb-main.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c index 5491817ef97..08ec1a7103f 100644 --- a/drivers/video/omap2/omapfb/omapfb-main.c +++ b/drivers/video/omap2/omapfb/omapfb-main.c @@ -737,6 +737,8 @@ int check_fb_var(struct fb_info *fbi, struct fb_var_screeninfo *var) FB_SYNC_HOR_HIGH_ACT : 0; var->sync |= timings.vsync_level == OMAPDSS_SIG_ACTIVE_HIGH ? FB_SYNC_VERT_HIGH_ACT : 0; + var->vmode = timings.interlace ? + FB_VMODE_INTERLACED : FB_VMODE_NONINTERLACED; } else { var->pixclock = 0; var->left_margin = 0; @@ -746,11 +748,9 @@ int check_fb_var(struct fb_info *fbi, struct fb_var_screeninfo *var) var->hsync_len = 0; var->vsync_len = 0; var->sync = 0; + var->vmode = FB_VMODE_NONINTERLACED; } - /* TODO: get these from panel->config */ - var->vmode = FB_VMODE_NONINTERLACED; - return 0; } @@ -2074,6 +2074,7 @@ static int omapfb_mode_to_timings(const char *mode_str, timings->vsync_level = var->sync & FB_SYNC_VERT_HIGH_ACT ? OMAPDSS_SIG_ACTIVE_HIGH : OMAPDSS_SIG_ACTIVE_LOW; + timings->interlace = var->vmode & FB_VMODE_INTERLACED; switch (var->bits_per_pixel) { case 16: @@ -2223,6 +2224,7 @@ static void fb_videomode_to_omap_timings(struct fb_videomode *m, t->vsync_level = m->sync & FB_SYNC_VERT_HIGH_ACT ? OMAPDSS_SIG_ACTIVE_HIGH : OMAPDSS_SIG_ACTIVE_LOW; + t->interlace = m->vmode & FB_VMODE_INTERLACED; } static int omapfb_find_best_mode(struct omap_dss_device *display, |