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

Commit 48e971cd authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

[media] V4L: sh_mobile_ceu_camera: maximum image size depends on the hardware version 



Newer CEU versions, e.g., the one, used on sh7372, support image sizes
larger than 2560x1920. Retrieve maximum sizes from platform properties.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 7705b6d8

drivers/media/video/sh_mobile_ceu_camera.c

+27 −8
Original line number Diff line number Diff line
@@ -112,6 +112,10 @@ struct sh_mobile_ceu_dev { 


	u32 cflcr;



	/* static max sizes either from platform data or default */

	int max_width;

	int max_height;



	enum v4l2_field field;

	int sequence;
@@ -1081,7 +1085,15 @@ static int sh_mobile_ceu_get_formats(struct soc_camera_device *icd, unsigned int 
		if (ret < 0)

			return ret;



		while ((mf.width > 2560 || mf.height > 1920) && shift < 4) {

		/*

		 * All currently existing CEU implementations support 2560x1920

		 * or larger frames. If the sensor is proposing too big a frame,

		 * don't bother with possibly supportred by the CEU larger

		 * sizes, just try VGA multiples. If needed, this can be

		 * adjusted in the future.

		 */

		while ((mf.width > pcdev->max_width ||

			mf.height > pcdev->max_height) && shift < 4) {

			/* Try 2560x1920, 1280x960, 640x480, 320x240 */

			mf.width	= 2560 >> shift;

			mf.height	= 1920 >> shift;
@@ -1377,6 +1389,8 @@ static int client_s_crop(struct soc_camera_device *icd, struct v4l2_crop *crop, 
static int client_s_fmt(struct soc_camera_device *icd,

			struct v4l2_mbus_framefmt *mf, bool ceu_can_scale)

{

	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);

	struct sh_mobile_ceu_dev *pcdev = ici->priv;

	struct sh_mobile_ceu_cam *cam = icd->host_priv;

	struct v4l2_subdev *sd = soc_camera_to_subdev(icd);

	struct device *dev = icd->parent;
@@ -1410,8 +1424,8 @@ static int client_s_fmt(struct soc_camera_device *icd, 
	if (ret < 0)

		return ret;



	max_width = min(cap.bounds.width, 2560);

	max_height = min(cap.bounds.height, 1920);

	max_width = min(cap.bounds.width, pcdev->max_width);

	max_height = min(cap.bounds.height, pcdev->max_height);



	/* Camera set a format, but geometry is not precise, try to improve */

	tmp_w = mf->width;
@@ -1551,7 +1565,7 @@ static int sh_mobile_ceu_set_crop(struct soc_camera_device *icd, 
	if (ret < 0)

		return ret;



	if (mf.width > 2560 || mf.height > 1920)

	if (mf.width > pcdev->max_width || mf.height > pcdev->max_height)

		return -EINVAL;



	/* 4. Calculate camera scales */
@@ -1834,6 +1848,8 @@ static int sh_mobile_ceu_set_fmt(struct soc_camera_device *icd, 
static int sh_mobile_ceu_try_fmt(struct soc_camera_device *icd,

				 struct v4l2_format *f)

{

	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);

	struct sh_mobile_ceu_dev *pcdev = ici->priv;

	const struct soc_camera_format_xlate *xlate;

	struct v4l2_pix_format *pix = &f->fmt.pix;

	struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
@@ -1854,8 +1870,8 @@ static int sh_mobile_ceu_try_fmt(struct soc_camera_device *icd, 
	/* FIXME: calculate using depth and bus width */



	/* CFSZR requires height and width to be 4-pixel aligned */

	v4l_bound_align_image(&pix->width, 2, 2560, 2,

			      &pix->height, 4, 1920, 2, 0);

	v4l_bound_align_image(&pix->width, 2, pcdev->max_width, 2,

			      &pix->height, 4, pcdev->max_height, 2, 0);



	width = pix->width;

	height = pix->height;
@@ -1890,8 +1906,8 @@ static int sh_mobile_ceu_try_fmt(struct soc_camera_device *icd, 
			 * requested a bigger rectangle, it will not return a

			 * smaller one.

			 */

			mf.width = 2560;

			mf.height = 1920;

			mf.width = pcdev->max_width;

			mf.height = pcdev->max_height;

			ret = v4l2_device_call_until_err(sd->v4l2_dev,

					soc_camera_grp_id(icd), video,

					try_mbus_fmt, &mf);
@@ -2082,6 +2098,9 @@ static int __devinit sh_mobile_ceu_probe(struct platform_device *pdev) 
		goto exit_kfree;

	}



	pcdev->max_width = pcdev->pdata->max_width ? : 2560;

	pcdev->max_height = pcdev->pdata->max_height ? : 1920;



	base = ioremap_nocache(res->start, resource_size(res));

	if (!base) {

		err = -ENXIO;

include/media/sh_mobile_ceu.h

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ struct sh_mobile_ceu_companion { 


struct sh_mobile_ceu_info {

	unsigned long flags;

	int max_width;

	int max_height;

	struct sh_mobile_ceu_companion *csi2;

};