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

Commit 3420f1b3 authored by Sergey Zakharchenko's avatar Sergey Zakharchenko Committed by Greg Kroah-Hartman
Browse files

media: uvcvideo: Add a quirk to force GEO GC6500 Camera bits-per-pixel value 



[ Upstream commit 1dd2e8f942574e2be18374ebb81751082d8d467c ]

This device does not function correctly in raw mode in kernel
versions validating buffer sizes in bulk mode. It erroneously
announces 16 bits per pixel instead of 12 for NV12 format, so it
needs this quirk to fix computed frame size and avoid legitimate
frames getting discarded.

[Move info and div variables to local scope]

Signed-off-by: default avatarSergey Zakharchenko <szakharchenko@digital-loggers.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3f6c8de7

drivers/media/usb/uvc/uvc_driver.c

+25 −0
Original line number Diff line number Diff line
@@ -497,6 +497,22 @@ static int uvc_parse_format(struct uvc_device *dev, 
			}

		}



		/* Some devices report bpp that doesn't match the format. */

		if (dev->quirks & UVC_QUIRK_FORCE_BPP) {

			const struct v4l2_format_info *info =

				v4l2_format_info(format->fcc);



			if (info) {

				unsigned int div = info->hdiv * info->vdiv;



				n = info->bpp[0] * div;

				for (i = 1; i < info->comp_planes; i++)

					n += info->bpp[i];



				format->bpp = DIV_ROUND_UP(8 * n, div);

			}

		}



		if (buffer[2] == UVC_VS_FORMAT_UNCOMPRESSED) {

			ftype = UVC_VS_FRAME_UNCOMPRESSED;

		} else {
@@ -2874,6 +2890,15 @@ static const struct usb_device_id uvc_ids[] = { 
	  .bInterfaceSubClass	= 1,

	  .bInterfaceProtocol	= 0,

	  .driver_info		= (kernel_ulong_t)&uvc_quirk_force_y8 },

	/* GEO Semiconductor GC6500 */

	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE

				| USB_DEVICE_ID_MATCH_INT_INFO,

	  .idVendor		= 0x29fe,

	  .idProduct		= 0x4d53,

	  .bInterfaceClass	= USB_CLASS_VIDEO,

	  .bInterfaceSubClass	= 1,

	  .bInterfaceProtocol	= 0,

	  .driver_info		= UVC_INFO_QUIRK(UVC_QUIRK_FORCE_BPP) },

	/* Intel RealSense D4M */

	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE

				| USB_DEVICE_ID_MATCH_INT_INFO,

drivers/media/usb/uvc/uvcvideo.h

+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ 
#define UVC_QUIRK_RESTRICT_FRAME_RATE	0x00000200

#define UVC_QUIRK_RESTORE_CTRLS_ON_INIT	0x00000400

#define UVC_QUIRK_FORCE_Y8		0x00000800

#define UVC_QUIRK_FORCE_BPP		0x00001000



/* Format flags */

#define UVC_FMT_FLAG_COMPRESSED		0x00000001