Commit 23bae3ad authored by Archit Taneja's avatar Archit Taneja Committed by Tomi Valkeinen

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: default avatarArchit Taneja <archit@ti.com>
parent 8050cbe4
...@@ -737,6 +737,8 @@ int check_fb_var(struct fb_info *fbi, struct fb_var_screeninfo *var) ...@@ -737,6 +737,8 @@ int check_fb_var(struct fb_info *fbi, struct fb_var_screeninfo *var)
FB_SYNC_HOR_HIGH_ACT : 0; FB_SYNC_HOR_HIGH_ACT : 0;
var->sync |= timings.vsync_level == OMAPDSS_SIG_ACTIVE_HIGH ? var->sync |= timings.vsync_level == OMAPDSS_SIG_ACTIVE_HIGH ?
FB_SYNC_VERT_HIGH_ACT : 0; FB_SYNC_VERT_HIGH_ACT : 0;
var->vmode = timings.interlace ?
FB_VMODE_INTERLACED : FB_VMODE_NONINTERLACED;
} else { } else {
var->pixclock = 0; var->pixclock = 0;
var->left_margin = 0; var->left_margin = 0;
...@@ -746,11 +748,9 @@ int check_fb_var(struct fb_info *fbi, struct fb_var_screeninfo *var) ...@@ -746,11 +748,9 @@ int check_fb_var(struct fb_info *fbi, struct fb_var_screeninfo *var)
var->hsync_len = 0; var->hsync_len = 0;
var->vsync_len = 0; var->vsync_len = 0;
var->sync = 0; var->sync = 0;
var->vmode = FB_VMODE_NONINTERLACED;
} }
/* TODO: get these from panel->config */
var->vmode = FB_VMODE_NONINTERLACED;
return 0; return 0;
} }
...@@ -2074,6 +2074,7 @@ static int omapfb_mode_to_timings(const char *mode_str, ...@@ -2074,6 +2074,7 @@ static int omapfb_mode_to_timings(const char *mode_str,
timings->vsync_level = var->sync & FB_SYNC_VERT_HIGH_ACT ? timings->vsync_level = var->sync & FB_SYNC_VERT_HIGH_ACT ?
OMAPDSS_SIG_ACTIVE_HIGH : OMAPDSS_SIG_ACTIVE_HIGH :
OMAPDSS_SIG_ACTIVE_LOW; OMAPDSS_SIG_ACTIVE_LOW;
timings->interlace = var->vmode & FB_VMODE_INTERLACED;
switch (var->bits_per_pixel) { switch (var->bits_per_pixel) {
case 16: case 16:
...@@ -2223,6 +2224,7 @@ static void fb_videomode_to_omap_timings(struct fb_videomode *m, ...@@ -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 ? t->vsync_level = m->sync & FB_SYNC_VERT_HIGH_ACT ?
OMAPDSS_SIG_ACTIVE_HIGH : OMAPDSS_SIG_ACTIVE_HIGH :
OMAPDSS_SIG_ACTIVE_LOW; OMAPDSS_SIG_ACTIVE_LOW;
t->interlace = m->vmode & FB_VMODE_INTERLACED;
} }
static int omapfb_find_best_mode(struct omap_dss_device *display, static int omapfb_find_best_mode(struct omap_dss_device *display,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment