From patchwork Tue Nov 22 08:48:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ai Chao X-Patchwork-Id: 13052037 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B720C433FE for ; Tue, 22 Nov 2022 08:49:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232465AbiKVIts (ORCPT ); Tue, 22 Nov 2022 03:49:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229459AbiKVItr (ORCPT ); Tue, 22 Nov 2022 03:49:47 -0500 Received: from mailgw.kylinos.cn (unknown [124.126.103.232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABFFE2EF27; Tue, 22 Nov 2022 00:49:45 -0800 (PST) X-UUID: a4ba9ef470ac43859a62a212c5ff47b9-20221122 X-CPASD-INFO: d934f1414b9e43fb80baa5b3114d7ae4@rYltVJNjYmFggnuxg3axnFhhkpGRYYK Cc2tUlGWRkVSVhH5xTV5nX1V9gnNXZF5dXFV3dnBQYmBhXVJ3i3-XblBgXoZgUZB3s3ttVJZfZA== X-CLOUD-ID: d934f1414b9e43fb80baa5b3114d7ae4 X-CPASD-SUMMARY: SIP:-1,APTIP:-2.0,KEY:0.0,FROMBLOCK:1,OB:0.0,URL:-5,TVAL:161. 0,ESV:0.0,ECOM:-5.0,ML:0.0,FD:0.0,CUTS:197.0,IP:-2.0,MAL:-5.0,PHF:-5.0,PHC:-5 .0,SPF:4.0,EDMS:-5,IPLABEL:4480.0,FROMTO:0,AD:0,FFOB:0.0,CFOB:0.0,SPC:0,SIG:- 5,AUF:7,DUF:8907,ACD:149,DCD:149,SL:0,EISP:0,AG:0,CFC:0.544,CFSR:0.029,UAT:0, RAF:0,IMG:-5.0,DFA:0,DTA:0,IBL:-2.0,ADI:-5,SBL:0,REDM:0,REIP:0,ESB:0,ATTNUM:0 ,EAF:0,CID:-5.0,VERSION:2.3.17 X-CPASD-ID: a4ba9ef470ac43859a62a212c5ff47b9-20221122 X-CPASD-BLOCK: 1000 X-CPASD-STAGE: 1 X-UUID: a4ba9ef470ac43859a62a212c5ff47b9-20221122 X-User: aichao@kylinos.cn Received: from localhost.localdomain [(112.64.161.44)] by mailgw (envelope-from ) (Generic MTA) with ESMTP id 1114180233; Tue, 22 Nov 2022 16:49:37 +0800 From: Ai Chao To: laurent.pinchart@ideasonboard.com, mchehab@kernel.org, ribalda@chromium.org Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ai Chao Subject: [PATCH v4] media: uvcvideo: Fix bandwidth error for Alcor camera Date: Tue, 22 Nov 2022 16:48:33 +0800 Message-Id: <20221122084833.1241078-1-aichao@kylinos.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org For Alcor Corp. Slave camera(1b17:6684/2017:0011), it support to output compressed video data, and it return a wrong dwMaxPayloadTransferSize fields. This is a fireware issue, but the manufacturer cannot provide a const return fieldsby the fireware. For some device, it requested 2752512 B/frame bandwidth. For normally device, it requested 3072 or 1024 B/frame bandwidth. so we check the dwMaxPayloadTransferSize fields,if it large than 0x1000, reset dwMaxPayloadTransferSize to 1024, and the camera preview normally. Signed-off-by: Ai Chao Reviewed-by: Ricardo Ribalda Reviewed-by: Jackie Liu --- change for v4 - Change usb_match_one_id to usb_match_id - Modify the discription change for v3 - Add VID/PID 2017:0011 change for v2 - Used usb_match_one_id to check VID and PID --- --- drivers/media/usb/uvc/uvc_video.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index d2eb9066e4dc..75bdd71d0e5a 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -135,6 +135,11 @@ static void uvc_fixup_video_ctrl(struct uvc_streaming *stream, static const struct usb_device_id elgato_cam_link_4k = { USB_DEVICE(0x0fd9, 0x0066) }; + static const struct usb_device_id alcor_corp_slave_cam[] = { + { USB_DEVICE(0x2017, 0x0011) }, + { USB_DEVICE(0x1b17, 0x6684) }, + { } + }; struct uvc_format *format = NULL; struct uvc_frame *frame = NULL; unsigned int i; @@ -234,6 +239,13 @@ static void uvc_fixup_video_ctrl(struct uvc_streaming *stream, ctrl->dwMaxPayloadTransferSize = bandwidth; } + + /* Alcor Corp. Slave camera return wrong dwMaxPayloadTransferSize */ + if ((format->flags & UVC_FMT_FLAG_COMPRESSED) && + (ctrl->dwMaxPayloadTransferSize > 0x1000) && + usb_match_id(stream->dev->intf, alcor_corp_slave_cam)) { + ctrl->dwMaxPayloadTransferSize = 1024; + } } static size_t uvc_video_ctrl_size(struct uvc_streaming *stream)