diff options
| author | Robby Cai <r63905@freescale.com> | 2015-06-01 18:49:40 +0800 |
|---|---|---|
| committer | Robby Cai <r63905@freescale.com> | 2015-06-01 19:00:56 +0800 |
| commit | 306a1b45c88451bcbe289bc911f3c52d1fd80862 (patch) | |
| tree | e806f8303f2276d55534fceb873f1f6b3dab1210 | |
| parent | 445b89b90f1c24e594e610bae9e9fa762b05698d (diff) | |
MLK-11007 Revert "MLK-10998 video: mxc ipuv3 fb: Fix wrong pixel component map when PRE is enabled"
This reverts commit 543b0799a446ecddedaa33847021bfc87d8262e1.
Because this patch will introduce the following error:
If only use /dev/video18 to display the video,
it will print IPU warning and gst dqueue failed.
imx-ipuv3 2400000.ipu: IPU Warning - IPU_INT_STAT_10 = 0x40000000
imx-ipuv3 2400000.ipu: IPU Warning - IPU_INT_STAT_10 = 0x00100000
imx-ipuv3 2400000.ipu: IPU Warning - IPU_INT_STAT_5 = 0x00800000
mxc_sdc_fb fb.24: timeout when waiting for flip irq
....
Signed-off-by: Robby Cai <r63905@freescale.com>
(cherry picked from commit 316c2a399871eaafff0a2f2b5a35e5398cebb41a)
| -rw-r--r-- | drivers/video/mxc/mxc_ipuv3_fb.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/video/mxc/mxc_ipuv3_fb.c b/drivers/video/mxc/mxc_ipuv3_fb.c index 776b66fcc0fd..a4a6556254bd 100644 --- a/drivers/video/mxc/mxc_ipuv3_fb.c +++ b/drivers/video/mxc/mxc_ipuv3_fb.c @@ -763,9 +763,8 @@ static int _setup_disp_channel2(struct fb_info *fbi) if (!mxc_fbi->on_the_fly) { retval = ipu_init_channel_buffer(mxc_fbi->ipu, mxc_fbi->ipu_ch, IPU_INPUT_BUFFER, - fbi_to_pixfmt(fbi, - !ipu_pixel_format_is_pre_yuv(fbi_to_pixfmt(fbi, true)) && - !ipu_pixel_format_is_gpu_tile(fbi_to_pixfmt(fbi, true))), + mxc_fbi->on_the_fly ? mxc_fbi->final_pfmt : + fbi_to_pixfmt(fbi, false), fbi->var.xres, fbi->var.yres, ipu_stride, fbi->var.rotate, @@ -1355,9 +1354,7 @@ static int mxcfb_set_par(struct fb_info *fbi) mxc_fbi->cur_var = fbi->var; mxc_fbi->cur_ipu_pfmt = on_the_fly ? mxc_fbi->final_pfmt : - fbi_to_pixfmt(fbi, - !ipu_pixel_format_is_pre_yuv(fbi_to_pixfmt(fbi, true)) && - !ipu_pixel_format_is_gpu_tile(fbi_to_pixfmt(fbi, true))); + fbi_to_pixfmt(fbi, false); mxc_fbi->cur_fb_pfmt = fbi_to_pixfmt(fbi, true); mxc_fbi->cur_prefetch = mxc_fbi->prefetch; |