From patchwork Tue Dec 13 08:37:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Scally X-Patchwork-Id: 13071798 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 53970C4332F for ; Tue, 13 Dec 2022 08:37:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234635AbiLMIhz (ORCPT ); Tue, 13 Dec 2022 03:37:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234659AbiLMIhx (ORCPT ); Tue, 13 Dec 2022 03:37:53 -0500 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EFBC18387 for ; Tue, 13 Dec 2022 00:37:52 -0800 (PST) Received: from mail.ideasonboard.com (cpc141996-chfd3-2-0-cust928.12-3.cable.virginm.net [86.13.91.161]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 5EAA6BB0; Tue, 13 Dec 2022 09:37:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1670920667; bh=HYAkiBlVXH/oDr4TWCmaohrgqzHjKYi2e666h7VOTTo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oM1I4bLUvs/rUksHkAhEr1RWFajxWjDo1eoKCiZ8fpoSyoDG20UDRsR/Ofa45FeEq PCM6DX0ubL0Najh5GGwLY1kB88+VzANohp1tJWcejbWwGcb2fJ2Z4sVes4g7ukrl53 +JlMlZInXs4FrPZdJt7cQbYJ3cuIbBNegzpxDzHs= From: Daniel Scally To: linux-usb@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com, gregkh@linuxfoundation.org, w36195@motorola.com, m.grzeschik@pengutronix.de, kieran.bingham@ideasonboard.com, torleiv@huddly.com, Daniel Scally Subject: [PATCH 3/6] usb: gadget: uvc: Copy color matching descriptor for each frame Date: Tue, 13 Dec 2022 08:37:33 +0000 Message-Id: <20221213083736.2284536-4-dan.scally@ideasonboard.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221213083736.2284536-1-dan.scally@ideasonboard.com> References: <20221213083736.2284536-1-dan.scally@ideasonboard.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org As currently implemented the default color matching descriptor is appended after _all_ the formats and frames that the gadget is configured with. According to the UVC specifications however this is supposed to be on a per-format basis (section 3.9.2.6): "Only one instance is allowed for a given format and if present, the Color Matching descriptor shall be placed following the Video and Still Image Frame descriptors for that format." Associate the default color matching descriptor with struct uvcg_format and copy it once-per-format instead of once only. Signed-off-by: Daniel Scally --- drivers/usb/gadget/function/uvc_configfs.c | 60 ++++++++++++++++++++-- drivers/usb/gadget/function/uvc_configfs.h | 1 + 2 files changed, 58 insertions(+), 3 deletions(-) diff --git a/drivers/usb/gadget/function/uvc_configfs.c b/drivers/usb/gadget/function/uvc_configfs.c index 9918e7b6a023..6f5932c9f09c 100644 --- a/drivers/usb/gadget/function/uvc_configfs.c +++ b/drivers/usb/gadget/function/uvc_configfs.c @@ -747,6 +747,28 @@ static const char * const uvcg_format_names[] = { "mjpeg", }; +static struct uvcg_cmd *uvcg_format_get_default_cmd(struct config_item *streaming) +{ + struct config_item *color_matching, *cm_default; + struct uvcg_cmd *cmd; + + color_matching = config_group_find_item(to_config_group(streaming), + "color_matching"); + if (!color_matching) + return NULL; + + cm_default = config_group_find_item(to_config_group(color_matching), + "default"); + config_item_put(color_matching); + if (!cm_default) + return NULL; + + cmd = to_uvcg_cmd(to_config_group(cm_default)); + config_item_put(cm_default); + + return cmd; +} + static ssize_t uvcg_format_bma_controls_show(struct uvcg_format *f, char *page) { struct f_uvc_opts *opts; @@ -1560,7 +1582,14 @@ static struct config_group *uvcg_uncompressed_make(struct config_group *group, 'Y', 'U', 'Y', '2', 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 }; + struct config_item *streaming; struct uvcg_uncompressed *h; + struct uvcg_cmd *cmd; + + streaming = group->cg_item.ci_parent; + cmd = uvcg_format_get_default_cmd(streaming); + if (!cmd) + return ERR_PTR(-EINVAL); h = kzalloc(sizeof(*h), GFP_KERNEL); if (!h) @@ -1579,6 +1608,7 @@ static struct config_group *uvcg_uncompressed_make(struct config_group *group, INIT_LIST_HEAD(&h->fmt.frames); h->fmt.type = UVCG_UNCOMPRESSED; + h->fmt.color_matching = cmd; config_group_init_type_name(&h->fmt.group, name, &uvcg_uncompressed_type); @@ -1743,7 +1773,14 @@ static const struct config_item_type uvcg_mjpeg_type = { static struct config_group *uvcg_mjpeg_make(struct config_group *group, const char *name) { + struct config_item *streaming; struct uvcg_mjpeg *h; + struct uvcg_cmd *cmd; + + streaming = group->cg_item.ci_parent; + cmd = uvcg_format_get_default_cmd(streaming); + if (!cmd) + return ERR_PTR(-EINVAL); h = kzalloc(sizeof(*h), GFP_KERNEL); if (!h) @@ -1760,6 +1797,7 @@ static struct config_group *uvcg_mjpeg_make(struct config_group *group, INIT_LIST_HEAD(&h->fmt.frames); h->fmt.type = UVCG_MJPEG; + h->fmt.color_matching = cmd; config_group_init_type_name(&h->fmt.group, name, &uvcg_mjpeg_type); @@ -1906,7 +1944,8 @@ static inline struct uvc_descriptor_header enum uvcg_strm_type { UVCG_HEADER = 0, UVCG_FORMAT, - UVCG_FRAME + UVCG_FRAME, + UVCG_CMD, }; /* @@ -1956,6 +1995,10 @@ static int __uvcg_iter_strm_cls(struct uvcg_streaming_header *h, if (ret) return ret; } + + ret = fun(f->fmt->color_matching, priv2, priv3, 0, UVCG_CMD); + if (ret) + return ret; } return ret; @@ -2011,6 +2054,11 @@ static int __uvcg_cnt_strm(void *priv1, void *priv2, void *priv3, int n, *size += frm->frame.b_frame_interval_type * sz; } break; + case UVCG_CMD: { + struct uvcg_cmd *cmd = priv1; + *size += sizeof(cmd->desc); + } + break; } ++*count; @@ -2096,6 +2144,13 @@ static int __uvcg_fill_strm(void *priv1, void *priv2, void *priv3, int n, frm->frame.b_frame_interval_type); } break; + case UVCG_CMD: { + struct uvcg_cmd *cmd = priv1; + + memcpy(*dest, &cmd->desc, sizeof(cmd->desc)); + *dest += sizeof(cmd->desc); + } + break; } return 0; @@ -2135,7 +2190,7 @@ static int uvcg_streaming_class_allow_link(struct config_item *src, if (ret) goto unlock; - count += 2; /* color_matching, NULL */ + count += 1; /* NULL */ *class_array = kcalloc(count, sizeof(void *), GFP_KERNEL); if (!*class_array) { ret = -ENOMEM; @@ -2162,7 +2217,6 @@ static int uvcg_streaming_class_allow_link(struct config_item *src, kfree(data_save); goto unlock; } - *cl_arr = (struct uvc_descriptor_header *)&opts->uvc_color_matching; ++target_hdr->linked; ret = 0; diff --git a/drivers/usb/gadget/function/uvc_configfs.h b/drivers/usb/gadget/function/uvc_configfs.h index f990739838d5..6582d6c7b6f6 100644 --- a/drivers/usb/gadget/function/uvc_configfs.h +++ b/drivers/usb/gadget/function/uvc_configfs.h @@ -57,6 +57,7 @@ struct uvcg_format { struct list_head frames; unsigned num_frames; __u8 bmaControls[UVCG_STREAMING_CONTROL_SIZE]; + struct uvcg_cmd *color_matching; }; struct uvcg_format_ptr {