Commit 58f22787 authored by Daniel Scally's avatar Daniel Scally Committed by Greg Kroah-Hartman
Browse files

usb: gadget: uvc: Make color matching attributes read/write 



In preparation for allowing more than the default color matching
descriptor, make the color matching attributes writeable.

Signed-off-by: default avatarDaniel Scally <dan.scally@ideasonboard.com>
Link: https://lore.kernel.org/r/20230202114142.300858-6-dan.scally@ideasonboard.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4e8a720e

Documentation/ABI/testing/configfs-usb-gadget-uvc

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,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

drivers/usb/gadget/function/uvc_configfs.c

+38 −1
Original line number Diff line number Diff line
@@ -1904,7 +1904,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);