diff options
| author | Liu Ying <Ying.Liu@freescale.com> | 2015-05-20 17:55:23 +0800 |
|---|---|---|
| committer | Liu Ying <Ying.Liu@freescale.com> | 2015-05-22 18:32:09 +0800 |
| commit | 855623ca0e87d8ad13f567f575e7e85af148836b (patch) | |
| tree | 96f8ed49790c18ea73edadd9717ab6701d6aa9a5 | |
| parent | d545ab54a52c46fb4da13298a0bab93476c9c0d9 (diff) | |
MLK-10937 video: mxc ipuv3 fb: Correct cur_blank for set_par bailout if no PRE available
We should set cur_blank to be FB_BLANK_POWERDOWN for set_par's bailout path
if no PRE is available and we are not in the 'on_the_fly' cases, because the
framebuffer is still in unblanked status even if we fail to allocate PRE in
the 'on_the_fly' cases.
Signed-off-by: Liu Ying <Ying.Liu@freescale.com>
(cherry picked from commit 79623a7509bf9c81c9b6722f120cde9a5e9a8a38)
| -rw-r--r-- | drivers/video/mxc/mxc_ipuv3_fb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/mxc/mxc_ipuv3_fb.c b/drivers/video/mxc/mxc_ipuv3_fb.c index 91a7fc393b79..a4a6556254bd 100644 --- a/drivers/video/mxc/mxc_ipuv3_fb.c +++ b/drivers/video/mxc/mxc_ipuv3_fb.c @@ -568,7 +568,8 @@ 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; + if (!mxc_fbi->on_the_fly) + mxc_fbi->cur_blank = FB_BLANK_POWERDOWN; return mxc_fbi->pre_num; } } |