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

Commit 787d0f9d authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

[media] V4l: sh_mobile_ceu_camera: fix cropping offset calculation 



Use the correct scales to calculate cropping offsets.

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

drivers/media/video/sh_mobile_ceu_camera.c

+4 −8
Original line number Diff line number Diff line
@@ -1348,7 +1348,7 @@ static int sh_mobile_ceu_set_crop(struct soc_camera_device *icd, 
	struct device *dev = icd->dev.parent;

	struct v4l2_mbus_framefmt mf;

	unsigned int scale_cam_h, scale_cam_v, scale_ceu_h, scale_ceu_v,

		out_width, out_height, scale_h, scale_v;

		out_width, out_height;

	int interm_width, interm_height;

	u32 capsr, cflcr;

	int ret;
@@ -1406,10 +1406,6 @@ static int sh_mobile_ceu_set_crop(struct soc_camera_device *icd, 
	scale_ceu_h	= calc_scale(interm_width, &out_width);

	scale_ceu_v	= calc_scale(interm_height, &out_height);



	/* Calculate camera scales */

	scale_h		= calc_generic_scale(cam_rect->width, out_width);

	scale_v		= calc_generic_scale(cam_rect->height, out_height);



	dev_geo(dev, "5: CEU scales %u:%u\n", scale_ceu_h, scale_ceu_v);



	/* Apply CEU scales. */
@@ -1421,8 +1417,8 @@ static int sh_mobile_ceu_set_crop(struct soc_camera_device *icd, 


	icd->user_width	 = out_width;

	icd->user_height = out_height;

	cam->ceu_left	 = scale_down(rect->left - cam_rect->left, scale_h) & ~1;

	cam->ceu_top	 = scale_down(rect->top - cam_rect->top, scale_v) & ~1;

	cam->ceu_left	 = scale_down(rect->left - cam_rect->left, scale_cam_h) & ~1;

	cam->ceu_top	 = scale_down(rect->top - cam_rect->top, scale_cam_v) & ~1;



	/* 6. Use CEU cropping to crop to the new window. */

	sh_mobile_ceu_set_rect(icd);
@@ -1433,7 +1429,7 @@ static int sh_mobile_ceu_set_crop(struct soc_camera_device *icd, 
		icd->user_width, icd->user_height,

		cam->ceu_left, cam->ceu_top);



	/* Restore capture */

	/* Restore capture. The CE bit can be cleared by the hardware */

	if (pcdev->active)

		capsr |= 1;

	capture_restore(pcdev, capsr);