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

Commit 8b57b966 authored by Florian Vaussard's avatar Florian Vaussard Committed by Mauro Carvalho Chehab
Browse files

[media] omap3isp: preview: Fix the crop margins 



Commit 3fdfedaa "[media] omap3isp: preview: Lower the crop margins"
accidentally changed the previewer's cropping, causing the previewer
to miss four pixels on each line, thus corrupting the final image.
Restored the removed setting.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarFlorian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent efab6b6a

drivers/media/platform/omap3isp/isppreview.c

+9 −0
Original line number Diff line number Diff line
@@ -1079,6 +1079,7 @@ static void preview_config_input_format(struct isp_prev_device *prev, 
 */

static void preview_config_input_size(struct isp_prev_device *prev, u32 active)

{

	const struct v4l2_mbus_framefmt *format = &prev->formats[PREV_PAD_SINK];

	struct isp_device *isp = to_isp_device(prev);

	unsigned int sph = prev->crop.left;

	unsigned int eph = prev->crop.left + prev->crop.width - 1;
@@ -1086,6 +1087,14 @@ static void preview_config_input_size(struct isp_prev_device *prev, u32 active) 
	unsigned int elv = prev->crop.top + prev->crop.height - 1;

	u32 features;



	if (format->code != V4L2_MBUS_FMT_Y8_1X8 &&

	    format->code != V4L2_MBUS_FMT_Y10_1X10) {

		sph -= 2;

		eph += 2;

		slv -= 2;

		elv += 2;

	}



	features = (prev->params.params[0].features & active)

		 | (prev->params.params[1].features & ~active);