From 2c61995140f6d45ae6cbaddb5a6686b14516fe1b Mon Sep 17 00:00:00 2001 From: Cai YiWei Date: Mon, 7 Jan 2019 17:03:32 +0800 Subject: [PATCH] media: rockchip: isp1: fix sp rgb output format sp rgb888 format is bgrx 32bit in memory, change to BGRX. sp rgb666 format is 2bit unused + 6bit data as b/g/r, append 1bits unused, 32bit in memory, no V4L2 format apply to it, so delete it. Change-Id: Iff8c2e560030d76b26d81faff19a3bd49ca33643 Signed-off-by: Cai YiWei --- drivers/media/platform/rockchip/isp1/capture.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/media/platform/rockchip/isp1/capture.c b/drivers/media/platform/rockchip/isp1/capture.c index 6a0cc8ba3c19..64105c1f699d 100644 --- a/drivers/media/platform/rockchip/isp1/capture.c +++ b/drivers/media/platform/rockchip/isp1/capture.c @@ -503,9 +503,9 @@ static const struct capture_fmt sp_fmts[] = { }, /* rgb */ { - .fourcc = V4L2_PIX_FMT_RGB24, + .fourcc = V4L2_PIX_FMT_XBGR32, .fmt_type = FMT_RGB, - .bpp = { 24 }, + .bpp = { 32 }, .mplanes = 1, .write_format = MI_CTRL_SP_WRITE_PLA, .output_format = MI_CTRL_SP_OUTPUT_RGB888, @@ -516,14 +516,7 @@ static const struct capture_fmt sp_fmts[] = { .mplanes = 1, .write_format = MI_CTRL_SP_WRITE_PLA, .output_format = MI_CTRL_SP_OUTPUT_RGB565, - }, { - .fourcc = V4L2_PIX_FMT_BGR666, - .fmt_type = FMT_RGB, - .bpp = { 18 }, - .mplanes = 1, - .write_format = MI_CTRL_SP_WRITE_PLA, - .output_format = MI_CTRL_SP_OUTPUT_RGB666, - }, + } }; static const struct capture_fmt raw_fmts[] = {