Commit 4d3aafb9 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

media: atomisp: Fix VIDIOC_TRY_FMT 



atomisp_try_fmt() calls the sensor's try_fmt handler but it does
not copy the result back to the passed in v4l2_pix_format under
some circumstances.

Potentially returning an unsupported resolution to userspace,
which VIDIOC_TRY_FMT is not supposed to do.

atomisp_set_fmt() also uses atomisp_try_fmt() and relies
on this wrong behavior. The VIDIOC_TRY_FMT call passes NULL for
the res_overflow argument where as the atomisp_set_fmt() call
passes non NULL.

Use the res_overflow argument to differentiate between the 2 callers
and always propagate the sensors result in the VIDIOC_TRY_FMT case.

This fixes the resolution list in camorama showing resolutions like e.g.
1584x1184 instead of 1600x1200.

Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent e0565e23

drivers/staging/media/atomisp/pci/atomisp_cmd.c

+2 −2
Original line number Diff line number Diff line
@@ -4886,8 +4886,8 @@ int atomisp_try_fmt(struct video_device *vdev, struct v4l2_pix_format *f, 
		return 0;

	}



	if (snr_mbus_fmt->width < f->width

	    && snr_mbus_fmt->height < f->height) {

	if (!res_overflow || (snr_mbus_fmt->width < f->width &&

			      snr_mbus_fmt->height < f->height)) {

		f->width = snr_mbus_fmt->width;

		f->height = snr_mbus_fmt->height;

		/* Set the flag when resolution requested is