openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: exynos4-is: Properly set JPEG options for parallel ports 

Commit ee7160e57c ("[media] s5p-fimc: Add support for JPEG capture")
added support for JPEG capture, but missed setting a register when the
parallel port was used rather than the CSIS device.

Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Jonathan Bakker 2020-07-31 01:01:08 +02:00 committed by Mauro Carvalho Chehab
parent b127f8db75
commit 1068fe3aaf
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/platform/exynos4-is/fimc-reg.c
View File

@ -606,6 +606,11 @@ int fimc_hw_set_camera_source(struct fimc_dev *fimc,
switch (source->fimc_bus_type) { switch (source->fimc_bus_type) {
case FIMC_BUS_TYPE_ITU_601: case FIMC_BUS_TYPE_ITU_601:
case FIMC_BUS_TYPE_ITU_656: case FIMC_BUS_TYPE_ITU_656:
if (fimc_fmt_is_user_defined(f->fmt->color)) {
cfg |= FIMC_REG_CISRCFMT_ITU601_8BIT;
break;
}
for (i = 0; i < ARRAY_SIZE(pix_desc); i++) { for (i = 0; i < ARRAY_SIZE(pix_desc); i++) {
if (vc->ci_fmt.code == pix_desc[i].pixelcode) { if (vc->ci_fmt.code == pix_desc[i].pixelcode) {
cfg = pix_desc[i].cisrcfmt; cfg = pix_desc[i].cisrcfmt;
@ -707,6 +712,8 @@ int fimc_hw_set_camera_type(struct fimc_dev *fimc,
case FIMC_BUS_TYPE_ITU_601...FIMC_BUS_TYPE_ITU_656: case FIMC_BUS_TYPE_ITU_601...FIMC_BUS_TYPE_ITU_656:
if (source->mux_id == 0) /* ITU-A, ITU-B: 0, 1 */ if (source->mux_id == 0) /* ITU-A, ITU-B: 0, 1 */
cfg |= FIMC_REG_CIGCTRL_SELCAM_ITU_A; cfg |= FIMC_REG_CIGCTRL_SELCAM_ITU_A;
if (vid_cap->ci_fmt.code == MEDIA_BUS_FMT_JPEG_1X8)
cfg |= FIMC_REG_CIGCTRL_CAM_JPEG;
break; break;
case FIMC_BUS_TYPE_LCD_WRITEBACK_A: case FIMC_BUS_TYPE_LCD_WRITEBACK_A:
cfg |= FIMC_REG_CIGCTRL_CAMIF_SELWB; cfg |= FIMC_REG_CIGCTRL_CAMIF_SELWB;