Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94945730 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab
Browse files

[media] exynos4-is: Set valid initial format on FIMC-IS-ISP subdev pads



Ensure there is a valid initial resolution and pixel format set
at the FIMC-IS-ISP subdev pads.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 5cfaad64
Loading
Loading
Loading
Loading
+18 −0
Original line number Original line Diff line number Diff line
@@ -645,6 +645,22 @@ static const struct v4l2_ctrl_ops fimc_isp_ctrl_ops = {
	.s_ctrl	= fimc_is_s_ctrl,
	.s_ctrl	= fimc_is_s_ctrl,
};
};


static void __isp_subdev_set_default_format(struct fimc_isp *isp)
{
	struct fimc_is *is = fimc_isp_to_is(isp);

	isp->sink_fmt.width = DEFAULT_PREVIEW_STILL_WIDTH +
				FIMC_ISP_CAC_MARGIN_WIDTH;
	isp->sink_fmt.height = DEFAULT_PREVIEW_STILL_HEIGHT +
				FIMC_ISP_CAC_MARGIN_HEIGHT;
	isp->sink_fmt.code = V4L2_MBUS_FMT_SGRBG10_1X10;

	isp->src_fmt.width = DEFAULT_PREVIEW_STILL_WIDTH;
	isp->src_fmt.height = DEFAULT_PREVIEW_STILL_HEIGHT;
	isp->src_fmt.code = V4L2_MBUS_FMT_SGRBG10_1X10;
	__is_set_frame_size(is, &isp->src_fmt);
}

int fimc_isp_subdev_create(struct fimc_isp *isp)
int fimc_isp_subdev_create(struct fimc_isp *isp)
{
{
	const struct v4l2_ctrl_ops *ops = &fimc_isp_ctrl_ops;
	const struct v4l2_ctrl_ops *ops = &fimc_isp_ctrl_ops;
@@ -725,6 +741,8 @@ int fimc_isp_subdev_create(struct fimc_isp *isp)
	sd->entity.ops = &fimc_is_subdev_media_ops;
	sd->entity.ops = &fimc_is_subdev_media_ops;
	v4l2_set_subdevdata(sd, isp);
	v4l2_set_subdevdata(sd, isp);


	__isp_subdev_set_default_format(isp);

	return 0;
	return 0;
}
}