diff options
author | Jason Chen <b02280@freescale.com> | 2011-11-15 17:57:46 +0800 |
---|---|---|
committer | Jason Liu <r64343@freescale.com> | 2012-01-09 21:06:40 +0800 |
commit | f396b37408d037bc8e0f5e29ef97f25cba9a6d71 (patch) | |
tree | 7fb35d626faa7d1e31d16278e1e2c348afd944fb /drivers/media | |
parent | 45dd12014ea05141d8b2750538346b8fd222906c (diff) |
ENGR00162218 mxc_vout: put set position function before set var
fb set var will check the window position with window size, so the
correct way is setting position before fb_set_var.
Signed-off-by: Jason Chen <b02280@freescale.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/mxc/output/mxc_vout.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/mxc/output/mxc_vout.c b/drivers/media/video/mxc/output/mxc_vout.c index b55abbe8158b..1cacbd6e2fa4 100644 --- a/drivers/media/video/mxc/output/mxc_vout.c +++ b/drivers/media/video/mxc/output/mxc_vout.c @@ -1256,6 +1256,10 @@ static int config_disp_output(struct mxc_vout_output *vout) "set display fb to %d %d\n", var.xres, var.yres); + ret = set_window_position(vout); + if (ret < 0) + return ret; + /* Init display channel through fb API */ var.yoffset = 0; var.activate |= FB_ACTIVATE_FORCE; @@ -1271,10 +1275,6 @@ static int config_disp_output(struct mxc_vout_output *vout) for (i = 0; i < fb_num; i++) vout->disp_bufs[i] = fbi->fix.smem_start + i * display_buf_size; - ret = set_window_position(vout); - if (ret < 0) - return ret; - console_lock(); ret = fb_blank(fbi, FB_BLANK_UNBLANK); console_unlock(); |