From patchwork Thu Mar 9 12:55:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 66842 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp279043wrd; Thu, 9 Mar 2023 05:08:51 -0800 (PST) X-Google-Smtp-Source: AK7set8NViTDv6aaUYccGXQkWBrReQOQy/L0IbsimX8wN8dYehgNVm8ELXHU2SeWJ1u/9SqDlKk9 X-Received: by 2002:a17:902:e88e:b0:19c:df17:7c8e with SMTP id w14-20020a170902e88e00b0019cdf177c8emr26988509plg.68.1678367331471; Thu, 09 Mar 2023 05:08:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678367331; cv=none; d=google.com; s=arc-20160816; b=KirmygASP41Ke3Pp22+jQYKEuMCvBSPcXNR0abrz8mLgOMtwe1Bizi5A8gDGL9PPo+ ufxpfqtwcu+AelZZynu/0svpM2Kl4w0rppc9iEeazvHSaBkL7Yf6hkLzCI7F5h9ydE+w gxN79JadEOYWwKjFY7RCjAhwbYArDzC+6xwhD5bF4xsljZwPvzBOszMvUH9LDsS/0D+D ROJJAstSg6T+EjzkvjdzX4HANBF1BBrgvnHxLvmocxTlCe8H96TRRlqZQYLof8V8upG2 3UsOjxv+uLnsD38f0o5LR/0RXUnFxcphId4IC0vL4bSIt7bjPv97i+rXzFkOWdPxP8Tr R9cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=7BPyhUJo2IJ440ycAVWGg+bKDSXaxq1Jdyu36gyWJDY=; b=qgzGG0D8rTsrbry97EejU1nAGlgXVg4jxig+9wKN+AGQLGOQ9TogMkPVew0k0goHXI Cq1M/YG/5+NHTyOe5VnKe+Sf2EAaKqGpCGluAa5yB92LKFg3RaWkK2Fj0KKZtn6QHF/G NLEuvRN7d7pgtr7RuCCDyl0JmOKL6v9UEr6YPP25IBGDzBWRijKAepC/31hiOhkgJiWb OrCasa15H7uZooAVng4ET+B8hs2EPfaDpM3EUnnQMXPPP+zL73M7JwBC0HptxUBmexIZ LCiqHsk2N8pbE4D7NZJnwpLC1+9qFz13ugPMpFNJl/j/uV4gH/CgRABoMktE4MFww8jU MUag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=YZLhQdWq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b2-20020a170902ed0200b0019a9c0e9adasi17034997pld.278.2023.03.09.05.08.36; Thu, 09 Mar 2023 05:08:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=YZLhQdWq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231319AbjCIM5v (ORCPT + 99 others); Thu, 9 Mar 2023 07:57:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230104AbjCIM5X (ORCPT ); Thu, 9 Mar 2023 07:57:23 -0500 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA167EE75E for ; Thu, 9 Mar 2023 04:56:44 -0800 (PST) Received: by mail-ed1-x531.google.com with SMTP id da10so6625230edb.3 for ; Thu, 09 Mar 2023 04:56:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1678366567; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=7BPyhUJo2IJ440ycAVWGg+bKDSXaxq1Jdyu36gyWJDY=; b=YZLhQdWqvwOgjs2qhMAhjeIEdYmdTlly6E2NEFhNCqQGfVxSZJb6jyvQ9yHWVcz7RK u/HbhcBpT2tu2AReoXK/zQ3s10jZUTTHqbwkZIOSdLJzd15cI2YGYBTOz1hKPSNH/cKD Jrjp3qErHgGDC2UUB5T+F7QORkstD1JRuzk0Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678366567; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7BPyhUJo2IJ440ycAVWGg+bKDSXaxq1Jdyu36gyWJDY=; b=Lh8U7RzZ9CVnYSe0AbY1s9Nz6WE75B4tRjACzLXgbMmkoeqv6T3O/3tmjWGFwYCMRv LdQM7coXxa/tLEhZFmNQs+p5J4Q7mzqMOzscU9I09b7LpbE1BuVZhwCva0E3a5JyFk7h 6dBF5Gv7HzVwggJZoZYw2xCGm/Va3ut8aKOw87S2F0MZhSAI8dG+osC0AnkkIs3VR4mj YRQQUUWfXDXmoh4G7T5gKQBz27coTy4MZs35pB4pw75ra9QHQoRi9cz9dMr3sieqxsEO 2nCTwlcjCiDc0B2lXnEuvGMtuGFAPfDaLHnm8mVqc/gf9kM0jttzivUSwDZKdNdUiLFw CExQ== X-Gm-Message-State: AO0yUKWyRk1MUnzjFtKuiKKbYwuBk48mvhrdq5O+LnpdOGBAheNBRtt9 7kO4qEYvhKv8ELgsrHn47ahT49bMHYdJ2mc1dwtiZg== X-Received: by 2002:a17:906:4953:b0:877:a2d1:7560 with SMTP id f19-20020a170906495300b00877a2d17560mr21050758ejt.27.1678366567425; Thu, 09 Mar 2023 04:56:07 -0800 (PST) Received: from alco.roam.corp.google.com ([2620:0:1059:10:1645:7aa4:a765:1966]) by smtp.gmail.com with ESMTPSA id hy26-20020a1709068a7a00b008d92897cc29sm8799523ejc.37.2023.03.09.04.56.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 04:56:07 -0800 (PST) From: Ricardo Ribalda Date: Thu, 09 Mar 2023 13:55:16 +0100 Subject: [PATCH v6 2/5] media: uvcvideo: Quirk for invalid dev_sof in Logitech C922 MIME-Version: 1.0 Message-Id: <20220920-resend-hwtimestamp-v6-2-c7a99299ec35@chromium.org> References: <20220920-resend-hwtimestamp-v6-0-c7a99299ec35@chromium.org> In-Reply-To: <20220920-resend-hwtimestamp-v6-0-c7a99299ec35@chromium.org> To: Mauro Carvalho Chehab , Laurent Pinchart Cc: linux-media@vger.kernel.org, Ricardo Ribalda , Sergey Senozhatsky , linux-kernel@vger.kernel.org, "hn.chen" X-Mailer: b4 0.11.0-dev-696ae X-Developer-Signature: v=1; a=openpgp-sha256; l=5174; i=ribalda@chromium.org; h=from:subject:message-id; bh=fGx/5pJOYEPLRnhXYtWOAWi9O15PTHo6OOgt4cGK7yM=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBkCddddQCIr5C7jKmLOkFpRpHdWv8bbDzhCJSv2M/g PKKCSlaJAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCZAnXXQAKCRDRN9E+zzrEiP9mD/ 9zlYoO8h4dC+jcmYihHBzBS9RdW7yKbgTaKf9nrlZS1DSO0u4J1vZYdtVH/UOWdyE/q2HK5+FDLvKQ xUx/4ovpYJrrISliy9NjXK/Wb5jlJbMPmFiYscjtgO52I1MxdhZL4iD5QRiakdLMd2ydbHirsbdpdc urJA0+Y/h7yBiBOEyjQQZzEWVnFC+NYbd810uVGOWFpLvH2mLxdYDDEtnEOKZzVgIFQ12G819H2QYH tTC9cwoUNj86Z7fK+bvTtLu9rVj+xlOCd62/vxjCM5Qf9ziksIFGYakwE1tMWmxoWESWhZFUdYkMos 3dlEh4sT1MGu8rVuOu8mycMhZidlukrf4crG4KUtF5AZkTCGvRerO5bMdJpaLT6U8K5q+AXggIWNlL sS5k5ZOO150sLuJUqAlbHB1vGFUc+AxruemjodnS22jYzG8uBFMTnxR2zMRSfCrGuRMRy85V+iyJuI Uc+NbdYQ2nAmVEvBOwxHxKYMDyoyIsf7oZEOVO5spjffSMdTTCarMx4S1dl1tOaQ+UonOdcsXjB05Q 0uH6oU2LZv11I+GshDtvXzWix1nKc4ovd02QxqxQSfNu6y/4LDC0d/WaL/nfJwBx9NI0975CgpEz6+ C2NwpayhDMnMLIe2cjluso2zFt2tIzwSX4U5xLyRYIQCc7I0zmlkVN9RJUXQ== X-Developer-Key: i=ribalda@chromium.org; a=openpgp; fpr=9EC3BB66E2FC129A6F90B39556A0D81F9F782DA9 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759895703125753130?= X-GMAIL-MSGID: =?utf-8?q?1759895703125753130?= Logitech C922 internal SOF does not increases at a stable rate of 1kHz. This causes that the device_sof and the host_sof run at different rates, breaking the clock domain conversion algorithm. Eg: 30 (6) [-] none 30 614400 B 21.245557 21.395214 34.133 fps ts mono/SoE 31 (7) [-] none 31 614400 B 21.275327 21.427246 33.591 fps ts mono/SoE 32 (0) [-] none 32 614400 B 21.304739 21.459256 34.000 fps ts mono/SoE 33 (1) [-] none 33 614400 B 21.334324 21.495274 33.801 fps ts mono/SoE * 34 (2) [-] none 34 614400 B 21.529237 21.527297 5.130 fps ts mono/SoE * 35 (3) [-] none 35 614400 B 21.649416 21.559306 8.321 fps ts mono/SoE 36 (4) [-] none 36 614400 B 21.678789 21.595320 34.045 fps ts mono/SoE ... 99 (3) [-] none 99 614400 B 23.542226 23.696352 33.541 fps ts mono/SoE 100 (4) [-] none 100 614400 B 23.571578 23.728404 34.069 fps ts mono/SoE 101 (5) [-] none 101 614400 B 23.601425 23.760420 33.504 fps ts mono/SoE * 102 (6) [-] none 102 614400 B 23.798324 23.796428 5.079 fps ts mono/SoE * 103 (7) [-] none 103 614400 B 23.916271 23.828450 8.478 fps ts mono/SoE 104 (0) [-] none 104 614400 B 23.945720 23.860479 33.957 fps ts mono/SoE Instead of disabling completely the hardware timestamping for such hardware we take the assumption that the packet handling jitter is under 2ms and use the host_sof as dev_sof. We can think of the UVC hardware clock as a system with a coarse clock (the SOF) and a fine clock (the PTS). The coarse clock can be replaced with a clock on the same frequency, if the jitter of such clock is smaller than its sampling rate. That way we can save some of the precision of the fine clock. To probe this point we have run three experiments on the Logitech C922. On that experiment we run the camera at 33fps and we analyse the difference in msec between a frame and its predecessor. If we display the histogram of that value, a thinner histogram will mean a better meassurement. The results for: - original hw timestamp: https://ibb.co/D1HJJ4x - pure software timestamp: https://ibb.co/QC9MgVK - modified hw timestamp: https://ibb.co/8s9dBdk This bug in the camera firmware has been confirmed by the vendor. lsusb -v Bus 001 Device 044: ID 046d:085c Logitech, Inc. C922 Pro Stream Webcam Device Descriptor: bLength 18 bDescriptorType 1 bcdUSB 2.00 bDeviceClass 239 Miscellaneous Device bDeviceSubClass 2 bDeviceProtocol 1 Interface Association bMaxPacketSize0 64 idVendor 0x046d Logitech, Inc. idProduct 0x085c C922 Pro Stream Webcam bcdDevice 0.16 iManufacturer 0 iProduct 2 C922 Pro Stream Webcam iSerial 1 80B912DF bNumConfigurations 1 Signed-off-by: Ricardo Ribalda Reviewed-by: Sergey Senozhatsky --- drivers/media/usb/uvc/uvc_driver.c | 9 +++++++++ drivers/media/usb/uvc/uvc_video.c | 8 ++++++++ drivers/media/usb/uvc/uvcvideo.h | 1 + 3 files changed, 18 insertions(+) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index 7aefa76a42b3..678a5736c9df 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -2549,6 +2549,15 @@ static const struct usb_device_id uvc_ids[] = { .bInterfaceSubClass = 1, .bInterfaceProtocol = 0, .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_RESTORE_CTRLS_ON_INIT) }, + /* Logitech HD Pro Webcam C922 */ + { .match_flags = USB_DEVICE_ID_MATCH_DEVICE + | USB_DEVICE_ID_MATCH_INT_INFO, + .idVendor = 0x046d, + .idProduct = 0x085c, + .bInterfaceClass = USB_CLASS_VIDEO, + .bInterfaceSubClass = 1, + .bInterfaceProtocol = 0, + .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_INVALID_DEVICE_SOF) }, /* Chicony CNF7129 (Asus EEE 100HE) */ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index fc7f8b6fda85..e363a71dd190 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -547,6 +547,14 @@ uvc_video_clock_decode(struct uvc_streaming *stream, struct uvc_buffer *buf, stream->clock.last_sof = dev_sof; host_sof = usb_get_current_frame_number(stream->dev->udev); + + /* + * On some devices, like the Logitech C922, the device SOF does not run + * at a stable rate of 1kHz. For those devices use the host SOF instead. + */ + if (stream->dev->quirks & UVC_QUIRK_INVALID_DEVICE_SOF) + dev_sof = host_sof; + time = uvc_video_get_time(); /* diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 9a596c8d894a..07b2fdb80adf 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -73,6 +73,7 @@ #define UVC_QUIRK_FORCE_Y8 0x00000800 #define UVC_QUIRK_FORCE_BPP 0x00001000 #define UVC_QUIRK_WAKE_AUTOSUSPEND 0x00002000 +#define UVC_QUIRK_INVALID_DEVICE_SOF 0x00004000 /* Format flags */ #define UVC_FMT_FLAG_COMPRESSED 0x00000001