From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C0E2C4332E for ; Tue, 22 Dec 2020 23:06:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6AE4622D57 for ; Tue, 22 Dec 2020 23:06:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728214AbgLVXGW (ORCPT ); Tue, 22 Dec 2020 18:06:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728143AbgLVXGL (ORCPT ); Tue, 22 Dec 2020 18:06:11 -0500 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A786DC0611CA for ; Tue, 22 Dec 2020 15:04:53 -0800 (PST) Received: by mail-wr1-x432.google.com with SMTP id i9so16662815wrc.4 for ; Tue, 22 Dec 2020 15:04:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=06MDz+xB7KNYGGW1OIf0dRikIOLIKAmW3UNXPIs7AXg=; b=QmtaeuPPMC0PXX9txoGp+OXSv8kwMX+dNhPKNdYqpFV7FxbPoVV5QSzEp8zfMjigRd P5Q0AVOXNjor9XoLQZF9E9re3+DrZ8/HcaqENbfRrDaxm3bFw/ik2w9PT2XuNRqAC+UP agXz2fp6vHK1W4jHCSmvzm9Rki9RC1UX4Aews= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=06MDz+xB7KNYGGW1OIf0dRikIOLIKAmW3UNXPIs7AXg=; b=tlNID/74Uh8/Kg/ht73JAMFHYTWsmT52hGpV19NBkm3fpOuXyzxSU+9C6JmTCPZ57U W/HoARu5HX2ex+HtWjaiBRzhCLNbymlRr4x6p7OIn4N3+xZS4VKKxH1BO8l9QYFYvmiY l+yplxSSrp1tEz8SrIz9o+xExDNELHh6jeZkBjjOcytzyWxY8+kRPAkFiwIk2hRZYg+V VZfRczXOzibo2mmL8Rsfx7JZB52S3Q0XJw8j/bwsCJqP8P+63Pla4ugLnO9Mo7kbmrD+ B35a9r4R3mcA9sq1ImL0lPfBbq9YdHyfaExOphQs3YYm6Y3INaaTgu6E5oyEGghyxUel SRww== X-Gm-Message-State: AOAM533qHfCOiv8L8CEsCZRM+1EdF23Ou1IrgfvU2zJ+TC37yXHNmRyI xZNmJwG8KhIZbOchTzDO051U+g== X-Google-Smtp-Source: ABdhPJzkQ4XJIW9XHEY9OOjyJgSaYjZiKltQ9esyYUckW6XMaKKZVZ1z4kYSERYIGS7wCkSG9j1FMw== X-Received: by 2002:a5d:4987:: with SMTP id r7mr27069125wrq.352.1608678292437; Tue, 22 Dec 2020 15:04:52 -0800 (PST) Received: from alco.lan ([80.71.134.83]) by smtp.gmail.com with ESMTPSA id r16sm34463401wrx.36.2020.12.22.15.04.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Dec 2020 15:04:51 -0800 (PST) From: Ricardo Ribalda To: Laurent Pinchart , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ricardo Ribalda Subject: [PATCH v6 05/11] media: uvcvideo: Allow entity-defined get_info and get_cur Date: Wed, 23 Dec 2020 00:04:40 +0100 Message-Id: <20201222230446.1027916-6-ribalda@chromium.org> X-Mailer: git-send-email 2.29.2.729.g45daf8777d-goog In-Reply-To: <20201222230446.1027916-1-ribalda@chromium.org> References: <20201222230446.1027916-1-ribalda@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Allows controls to get their properties and current value from an entity-defined function instead of via a query to the USB device. Reviewed-by: Laurent Pinchart Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_ctrl.c | 22 ++++++++++++++++++---- drivers/media/usb/uvc/uvcvideo.h | 5 +++++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index 5fe228a3213b..acdc9b032306 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -980,10 +980,20 @@ static int __uvc_ctrl_get(struct uvc_video_chain *chain, return -EACCES; if (!ctrl->loaded) { - ret = uvc_query_ctrl(chain->dev, UVC_GET_CUR, ctrl->entity->id, - chain->dev->intfnum, ctrl->info.selector, + if (ctrl->entity->get_cur) { + ret = ctrl->entity->get_cur(chain->dev, + ctrl->entity, + ctrl->info.selector, uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT), ctrl->info.size); + } else { + ret = uvc_query_ctrl(chain->dev, UVC_GET_CUR, + ctrl->entity->id, + chain->dev->intfnum, + ctrl->info.selector, + uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT), + ctrl->info.size); + } if (ret < 0) return ret; @@ -1712,8 +1722,12 @@ static int uvc_ctrl_get_flags(struct uvc_device *dev, if (data == NULL) return -ENOMEM; - ret = uvc_query_ctrl(dev, UVC_GET_INFO, ctrl->entity->id, dev->intfnum, - info->selector, data, 1); + if (ctrl->entity->get_info) + ret = ctrl->entity->get_info(dev, ctrl->entity, + ctrl->info.selector, data); + else + ret = uvc_query_ctrl(dev, UVC_GET_INFO, ctrl->entity->id, + dev->intfnum, info->selector, data, 1); if (!ret) info->flags |= (data[0] & UVC_CONTROL_CAP_GET ? UVC_CTRL_FLAG_GET_CUR : 0) diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index d7954dcc2b60..64a3d901db19 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -358,6 +358,11 @@ struct uvc_entity { u8 bNrInPins; u8 *baSourceID; + int (*get_info)(struct uvc_device *dev, struct uvc_entity *entity, + u8 cs, u8 *caps); + int (*get_cur)(struct uvc_device *dev, struct uvc_entity *entity, + u8 cs, void *data, u16 size); + unsigned int ncontrols; struct uvc_control *controls; }; -- 2.29.2.729.g45daf8777d-goog