From: Daniel Scally <dan.scally@ideasonboard.com>
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 <dan.scally@ideasonboard.com>
Subject: [PATCH v3 6/7] usb: gadget: uvc: Make color matching attributes read/write
Date: Mon, 30 Jan 2023 14:26:38 +0000 [thread overview]
Message-ID: <20230130142639.217885-7-dan.scally@ideasonboard.com> (raw)
In-Reply-To: <20230130142639.217885-1-dan.scally@ideasonboard.com>
In preparation for allowing more than the default color matching
descriptor, make the color matching attributes writeable.
Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>
---
Changes in v3 (laurent):
- Put the refcnt check beind the mutex_lock(su_mutex) call
Changes in v2:
- Check refcnt before allowing the change in .store()
- Renamed uvcg_cmd to uvcg_color_matching
.../ABI/testing/configfs-usb-gadget-uvc | 2 +-
drivers/usb/gadget/function/uvc_configfs.c | 39 ++++++++++++++++++-
2 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/Documentation/ABI/testing/configfs-usb-gadget-uvc b/Documentation/ABI/testing/configfs-usb-gadget-uvc
index f00cff6d8c5c..53258b7c6f2d 100644
--- a/Documentation/ABI/testing/configfs-usb-gadget-uvc
+++ b/Documentation/ABI/testing/configfs-usb-gadget-uvc
@@ -165,7 +165,7 @@ Date: Dec 2014
KernelVersion: 4.0
Description: Default color matching descriptors
- All attributes read only:
+ All attributes read/write:
======================== ======================================
bMatrixCoefficients matrix used to compute luma and
diff --git a/drivers/usb/gadget/function/uvc_configfs.c b/drivers/usb/gadget/function/uvc_configfs.c
index 41f4ce7e8a9a..a9a1306ff579 100644
--- a/drivers/usb/gadget/function/uvc_configfs.c
+++ b/drivers/usb/gadget/function/uvc_configfs.c
@@ -1851,7 +1851,44 @@ static ssize_t uvcg_color_matching_##cname##_show( \
return result; \
} \
\
-UVC_ATTR_RO(uvcg_color_matching_, cname, aname)
+static ssize_t uvcg_color_matching_##cname##_store( \
+ struct config_item *item, const char *page, size_t len) \
+{ \
+ struct config_group *group = to_config_group(item); \
+ struct mutex *su_mutex = &group->cg_subsys->su_mutex; \
+ struct uvcg_color_matching *color_match = \
+ to_uvcg_color_matching(group); \
+ struct f_uvc_opts *opts; \
+ struct config_item *opts_item; \
+ int ret; \
+ u##bits num; \
+ \
+ ret = kstrtou##bits(page, 0, &num); \
+ if (ret) \
+ return ret; \
+ \
+ mutex_lock(su_mutex); /* for navigating configfs hierarchy */ \
+ \
+ if (color_match->refcnt) { \
+ ret = -EBUSY; \
+ goto unlock_su; \
+ } \
+ \
+ opts_item = group->cg_item.ci_parent->ci_parent->ci_parent; \
+ opts = to_f_uvc_opts(opts_item); \
+ \
+ mutex_lock(&opts->lock); \
+ \
+ color_match->desc.aname = num; \
+ ret = len; \
+ \
+ mutex_unlock(&opts->lock); \
+unlock_su: \
+ mutex_unlock(su_mutex); \
+ \
+ return ret; \
+} \
+UVC_ATTR(uvcg_color_matching_, cname, aname)
UVCG_COLOR_MATCHING_ATTR(b_color_primaries, bColorPrimaries, 8);
UVCG_COLOR_MATCHING_ATTR(b_transfer_characteristics, bTransferCharacteristics, 8);
--
2.34.1
next prev parent reply other threads:[~2023-01-30 14:29 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-30 14:26 [PATCH v3 0/7] UVC Gadget: Extend color matching support Daniel Scally
2023-01-30 14:26 ` [PATCH v3 1/7] usb: gadget: usb: Remove "default" from color matching attributes Daniel Scally
2023-01-30 14:26 ` [PATCH v3 2/7] usb: uvc: Enumerate valid values for color matching Daniel Scally
2023-01-30 14:26 ` [PATCH v3 3/7] usb: gadget: uvc: Add struct for color matching in configs Daniel Scally
2023-01-30 14:26 ` [PATCH v3 4/7] usb: gadget: uvc: Copy color matching descriptor for each frame Daniel Scally
2023-01-30 14:26 ` [PATCH v3 5/7] usb: gadget: uvc: Remove the hardcoded default color matching Daniel Scally
2023-01-30 14:26 ` Daniel Scally [this message]
2023-01-30 14:26 ` [PATCH v3 7/7] usb: gadget: uvc: Allow creating new color matching descriptors Daniel Scally
2023-02-02 10:18 ` [PATCH v3 0/7] UVC Gadget: Extend color matching support Greg KH
2023-02-02 10:20 ` Dan Scally
2023-02-02 10:29 ` Greg KH
2023-02-02 10:33 ` Dan Scally
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230130142639.217885-7-dan.scally@ideasonboard.com \
--to=dan.scally@ideasonboard.com \
--cc=gregkh@linuxfoundation.org \
--cc=kieran.bingham@ideasonboard.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-usb@vger.kernel.org \
--cc=m.grzeschik@pengutronix.de \
--cc=torleiv@huddly.com \
--cc=w36195@motorola.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox