aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Chen <b02280@freescale.com>2011-11-15 17:57:46 +0800
committerJason Chen <b02280@freescale.com>2011-11-16 16:32:06 +0800
commit18d03f417326c98d47cef69d02be0487ea5fe90d (patch)
tree2af941e2f7f7743d5883a939f87e407399b9b64d
parent0d60afe79ea354e3bcb6b136e66dc1eff9f3102b (diff)
downloadlinux-linaro-18d03f417326c98d47cef69d02be0487ea5fe90d.tar.gz
ENGR00162218 mxc_vout: put set position function before set varlt-3.1-2011.11-0
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>
-rw-r--r--drivers/media/video/mxc/output/mxc_vout.c8
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 b1730bb2c7b..2d110032032 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();