Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1499E3AAF6D; Mon, 17 Aug 2026 15:14:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786979655; cv=none; b=IhtetESoflwOh6dHNht0FZCNmNQ2FUxcI4ZMcpNQ2mWrF/SJHViBaJdmQiv6QHX+y+WFW0iJDQbBocjzSlXo6AZOqvSs3ohxKW7/IGUdrlyvGHPvUQi1FJGtPQn6J1bhWj7Rtygsr5d38HNVY6nW1bnUzoXrsAHFYvwViIXCpGk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786979655; c=relaxed/simple; bh=FqpV4O3IHPpDIZiVf0A/CEZsE80O/httH+11h19K5tA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=abr/A0wCpk9JOo4KlBn2iEodR4U6re6tZeKZ3PAg80vv1p8bJoD4I5vv/bd9gkMY3PcO++2sf/YZZjc0K7BYyd9CnxqQB9wwACOsy/UZRHkL0fHfz1yb1vH/hRfOlV7PYz8V2w4ZXhPVmdm61L85YkgSkcEDxzFSGuob068H/Z8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GIfvQEfm; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="GIfvQEfm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F4481F000E9; Mon, 17 Aug 2026 15:14:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1786979654; bh=mh93M/xVYmZ2UIKJ231U7HfeL+TvWITACzwgp4kQsQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GIfvQEfmeTMezmC5rlANtbDo4JDjcOlHeymnwL+ZzHo2d0K/Mm+gjFR3nd0CBfZli yuhNo08Mj2r4pyOVvmO+hfOWkDV2oq4O2+vqnFKyoxXjwfjjgT2kj0fE2Com3kUfo0 mgLukLT7718r1ub7lgmwsqTOinKGE+UEzlkoVv8g= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Isaac Scott , Ricardo Ribalda , Laurent Pinchart , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 6.1 301/609] media: uvcvideo: Implement dual stream quirk to fix loss of usb packets Date: Mon, 17 Aug 2026 15:29:57 +0200 Message-ID: <20260817132554.311882428@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260817132543.039278408@linuxfoundation.org> References: <20260817132543.039278408@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Isaac Scott commit c2eda35e675b6ea4a0a21a4b1167b121571a9036 upstream. Some cameras, such as the Sonix Technology Co. 292A, exhibit issues when running two parallel streams, causing USB packets to be dropped when an H.264 stream posts a keyframe while an MJPEG stream is running simultaneously. This occasionally causes the driver to erroneously output two consecutive JPEG images as a single frame. To fix this, we inspect the buffer, and trigger a new frame when we find an SOI. Signed-off-by: Isaac Scott Reviewed-by: Ricardo Ribalda Link: https://lore.kernel.org/r/20241128145144.61475-2-isaac.scott@ideasonboard.com Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab [Added JPEG_MARKER_SOI definition, jpeg header does not exist yet] Signed-off-by: Ricardo Ribalda Signed-off-by: Sasha Levin --- drivers/media/usb/uvc/uvc_video.c | 28 +++++++++++++++++++++++++++- drivers/media/usb/uvc/uvcvideo.h | 4 ++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index e33b9bedddda..408be24fceea 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -24,6 +24,8 @@ #include "uvcvideo.h" +#define JPEG_MARKER_SOI 0xd8 + /* ------------------------------------------------------------------------ * UVC Controls */ @@ -1089,6 +1091,7 @@ static int uvc_video_decode_start(struct uvc_streaming *stream, struct uvc_buffer *meta_buf, const u8 *data, int len) { + u8 header_len; u8 fid; /* @@ -1102,6 +1105,7 @@ static int uvc_video_decode_start(struct uvc_streaming *stream, return -EINVAL; } + header_len = data[0]; fid = data[1] & UVC_STREAM_FID; /* @@ -1194,9 +1198,31 @@ static int uvc_video_decode_start(struct uvc_streaming *stream, return -EAGAIN; } + /* + * Some cameras, when running two parallel streams (one MJPEG alongside + * another non-MJPEG stream), are known to lose the EOF packet for a frame. + * We can detect the end of a frame by checking for a new SOI marker, as + * the SOI always lies on the packet boundary between two frames for + * these devices. + */ + if (stream->dev->quirks & UVC_QUIRK_MJPEG_NO_EOF && + (stream->cur_format->fcc == V4L2_PIX_FMT_MJPEG || + stream->cur_format->fcc == V4L2_PIX_FMT_JPEG)) { + const u8 *packet = data + header_len; + + if (len >= header_len + 2 && + packet[0] == 0xff && packet[1] == JPEG_MARKER_SOI && + buf->bytesused != 0) { + buf->state = UVC_BUF_STATE_READY; + buf->error = 1; + stream->last_fid ^= UVC_STREAM_FID; + return -EAGAIN; + } + } + stream->last_fid = fid; - return data[0]; + return header_len; } static inline enum dma_data_direction uvc_stream_dir( diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index a7182305390b..8404814fa899 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -77,6 +77,10 @@ #define UVC_QUIRK_FORCE_Y8 0x00000800 #define UVC_QUIRK_FORCE_BPP 0x00001000 #define UVC_QUIRK_WAKE_AUTOSUSPEND 0x00002000 +#define UVC_QUIRK_NO_RESET_RESUME 0x00004000 +#define UVC_QUIRK_DISABLE_AUTOSUSPEND 0x00008000 +#define UVC_QUIRK_INVALID_DEVICE_SOF 0x00010000 +#define UVC_QUIRK_MJPEG_NO_EOF 0x00020000 /* Format flags */ #define UVC_FMT_FLAG_COMPRESSED 0x00000001 -- 2.53.0