From mboxrd@z Thu Jan 1 00:00:00 1970 From: Archit Taneja Date: Tue, 26 Jun 2012 09:48:51 +0000 Subject: [PATCH 14/17] OMAPFB: Map interlace field in omap_video_timings with fb vmode flags Message-Id: <1340703414-1915-16-git-send-email-archit@ti.com> List-Id: References: <1340703414-1915-1-git-send-email-archit@ti.com> In-Reply-To: <1340703414-1915-1-git-send-email-archit@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: tomi.valkeinen@ti.com Cc: rob@ti.com, linux-fbdev@vger.kernel.org, linux-omap@vger.kernel.org, Archit Taneja 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 --- drivers/video/omap2/omapfb/omapfb-main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c index 7c99725..434aa9a 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; } @@ -2063,6 +2063,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; timings->pclk_edge = OMAPDSS_SIG_ACTIVE_HIGH; timings->de_level = OMAPDSS_SIG_ACTIVE_HIGH; timings->hsync_vsync_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES; @@ -2206,6 +2207,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; t->pclk_edge = OMAPDSS_SIG_ACTIVE_HIGH; t->de_level = OMAPDSS_SIG_ACTIVE_HIGH; t->hsync_vsync_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES; -- 1.7.9.5