diff options
Diffstat (limited to 'drivers/media/platform/exynos4-is/fimc-isp.c')
-rw-r--r-- | drivers/media/platform/exynos4-is/fimc-isp.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/media/platform/exynos4-is/fimc-isp.c b/drivers/media/platform/exynos4-is/fimc-isp.c index f859b3cdd409..cf520a7d7f71 100644 --- a/drivers/media/platform/exynos4-is/fimc-isp.c +++ b/drivers/media/platform/exynos4-is/fimc-isp.c | |||
@@ -645,6 +645,22 @@ static const struct v4l2_ctrl_ops fimc_isp_ctrl_ops = { | |||
645 | .s_ctrl = fimc_is_s_ctrl, | 645 | .s_ctrl = fimc_is_s_ctrl, |
646 | }; | 646 | }; |
647 | 647 | ||
648 | static void __isp_subdev_set_default_format(struct fimc_isp *isp) | ||
649 | { | ||
650 | struct fimc_is *is = fimc_isp_to_is(isp); | ||
651 | |||
652 | isp->sink_fmt.width = DEFAULT_PREVIEW_STILL_WIDTH + | ||
653 | FIMC_ISP_CAC_MARGIN_WIDTH; | ||
654 | isp->sink_fmt.height = DEFAULT_PREVIEW_STILL_HEIGHT + | ||
655 | FIMC_ISP_CAC_MARGIN_HEIGHT; | ||
656 | isp->sink_fmt.code = V4L2_MBUS_FMT_SGRBG10_1X10; | ||
657 | |||
658 | isp->src_fmt.width = DEFAULT_PREVIEW_STILL_WIDTH; | ||
659 | isp->src_fmt.height = DEFAULT_PREVIEW_STILL_HEIGHT; | ||
660 | isp->src_fmt.code = V4L2_MBUS_FMT_SGRBG10_1X10; | ||
661 | __is_set_frame_size(is, &isp->src_fmt); | ||
662 | } | ||
663 | |||
648 | int fimc_isp_subdev_create(struct fimc_isp *isp) | 664 | int fimc_isp_subdev_create(struct fimc_isp *isp) |
649 | { | 665 | { |
650 | const struct v4l2_ctrl_ops *ops = &fimc_isp_ctrl_ops; | 666 | const struct v4l2_ctrl_ops *ops = &fimc_isp_ctrl_ops; |
@@ -725,6 +741,8 @@ int fimc_isp_subdev_create(struct fimc_isp *isp) | |||
725 | sd->entity.ops = &fimc_is_subdev_media_ops; | 741 | sd->entity.ops = &fimc_is_subdev_media_ops; |
726 | v4l2_set_subdevdata(sd, isp); | 742 | v4l2_set_subdevdata(sd, isp); |
727 | 743 | ||
744 | __isp_subdev_set_default_format(isp); | ||
745 | |||
728 | return 0; | 746 | return 0; |
729 | } | 747 | } |
730 | 748 | ||