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

Commit 87c2a57f authored by Michal Pecio's avatar Michal Pecio Committed by Greg Kroah-Hartman
Browse files

media: uvcvideo: Fix the bandwdith quirk on USB 3.x 



[ Upstream commit 9e3d55fbd160b3ca376599a68b4cddfdc67d4153 ]

The bandwidth fixup quirk doesn't know that SuperSpeed exists and has
the same 8 service intervals per millisecond as High Speed, hence its
calculations are wrong.

Assume that all speeds from HS up use 8 intervals per millisecond.

No further changes are needed, updated code has been confirmed to work
with all speeds from FS to SS.

Signed-off-by: default avatarMichal Pecio <michal.pecio@gmail.com>
Reviewed-by: default avatarRicardo Ribalda <ribalda@chromium.org>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://lore.kernel.org/r/20240414190040.2255a0bc@foxbook


Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 04637027

drivers/media/usb/uvc/uvc_video.c

+3 −3
Original line number Diff line number Diff line
@@ -207,13 +207,13 @@ static void uvc_fixup_video_ctrl(struct uvc_streaming *stream, 
		/* Compute a bandwidth estimation by multiplying the frame

		 * size by the number of video frames per second, divide the

		 * result by the number of USB frames (or micro-frames for

		 * high-speed devices) per second and add the UVC header size

		 * (assumed to be 12 bytes long).

		 * high- and super-speed devices) per second and add the UVC

		 * header size (assumed to be 12 bytes long).

		 */

		bandwidth = frame->wWidth * frame->wHeight / 8 * format->bpp;

		bandwidth *= 10000000 / interval + 1;

		bandwidth /= 1000;

		if (stream->dev->udev->speed == USB_SPEED_HIGH)

		if (stream->dev->udev->speed >= USB_SPEED_HIGH)

			bandwidth /= 8;

		bandwidth += 12;