summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiu Ying <Ying.Liu@freescale.com>2015-04-30 14:01:13 +0800
committerJason Liu <r64343@freescale.com>2015-05-08 17:25:19 +0800
commitb11073abae54a3357d95e1ea415435f8bb53568d (patch)
tree9e14841ebdf0bdde796313cacaa3a4a79570e365
parent8d1d1b099d1ace46d2e623d1f296f4f7cfb253d1 (diff)
MLK-10786 mxc ipuv3 fb: Correct ->cur_blank in bailout of ->set_par due to no PRE
We should set mxcfbi->cur_blank to be FB_BLANK_POWERDOWN in the bailout path of ops->set_par due to no PRE is available since the engine will be stopped scanning out frames in this case. Otherwise, the users may call the PAN_DISPLAY ioctrl to switch buffer right after the bailout path and accidently access the IPUv3 registers without the IPUv3 HSP clock being enabled - the system hangs up. Signed-off-by: Liu Ying <Ying.Liu@freescale.com> (cherry picked from commit 9f6b5d5a2f56bd6eb8717bd5469d298fd729a65f)
-rw-r--r--drivers/video/mxc/mxc_ipuv3_fb.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/mxc/mxc_ipuv3_fb.c b/drivers/video/mxc/mxc_ipuv3_fb.c
index c303404b6bca..91a7fc393b79 100644
--- a/drivers/video/mxc/mxc_ipuv3_fb.c
+++ b/drivers/video/mxc/mxc_ipuv3_fb.c
@@ -568,6 +568,7 @@ static int _setup_disp_channel2(struct fb_info *fbi)
"failed to alloc PRE\n");
mxc_fbi->prefetch = mxc_fbi->cur_prefetch;
mxc_fbi->resolve = false;
+ mxc_fbi->cur_blank = FB_BLANK_POWERDOWN;
return mxc_fbi->pre_num;
}
}