mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

usb: gadget: uvc: Copy color matching descriptor for each frame 

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 <dan.scally@ideasonboard.com>
Link: https://lore.kernel.org/r/20230202114142.300858-4-dan.scally@ideasonboard.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Daniel Scally 2023-02-02 11:41:39 +00:00 committed by Greg Kroah-Hartman
parent 744eb7b821
commit e187408cc1
2 changed files with 70 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
drivers/usb/gadget/function/uvc_configfs.c
View File

@ -801,6 +801,29 @@ static const char * const uvcg_format_names[] = {
"mjpeg",
};
static struct uvcg_color_matching *
uvcg_format_get_default_color_match(struct config_item *streaming)
{
struct config_item *color_matching_item, *cm_default;
struct uvcg_color_matching *color_match;
color_matching_item = config_group_find_item(to_config_group(streaming),
"color_matching");
if (!color_matching_item)
return NULL;
cm_default = config_group_find_item(to_config_group(color_matching_item),
"default");
config_item_put(color_matching_item);
if (!cm_default)
return NULL;
color_match = to_uvcg_color_matching(to_config_group(cm_default));
config_item_put(cm_default);
return color_match;
}
static ssize_t uvcg_format_bma_controls_show(struct uvcg_format *f, char *page)
{
struct f_uvc_opts *opts;
@ -1614,8 +1637,15 @@ 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 uvcg_color_matching *color_match;
struct config_item *streaming;
struct uvcg_uncompressed *h;
streaming = group->cg_item.ci_parent;
color_match = uvcg_format_get_default_color_match(streaming);
if (!color_match)
return ERR_PTR(-EINVAL);
h = kzalloc(sizeof(*h), GFP_KERNEL);
if (!h)
return ERR_PTR(-ENOMEM);
@ -1633,6 +1663,8 @@ 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 = color_match;
color_match->refcnt++;
config_group_init_type_name(&h->fmt.group, name,
&uvcg_uncompressed_type);
@ -1797,8 +1829,15 @@ static const struct config_item_type uvcg_mjpeg_type = {
static struct config_group *uvcg_mjpeg_make(struct config_group *group,
const char *name)
{
struct uvcg_color_matching *color_match;
struct config_item *streaming;
struct uvcg_mjpeg *h;
streaming = group->cg_item.ci_parent;
color_match = uvcg_format_get_default_color_match(streaming);
if (!color_match)
return ERR_PTR(-EINVAL);
h = kzalloc(sizeof(*h), GFP_KERNEL);
if (!h)
return ERR_PTR(-ENOMEM);
@ -1814,6 +1853,8 @@ 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 = color_match;
color_match->refcnt++;
config_group_init_type_name(&h->fmt.group, name,
&uvcg_mjpeg_type);
@ -1962,7 +2003,8 @@ static inline struct uvc_descriptor_header
enum uvcg_strm_type {
UVCG_HEADER = 0,
UVCG_FORMAT,
UVCG_FRAME
UVCG_FRAME,
UVCG_COLOR_MATCHING,
};
/*
@ -2012,6 +2054,11 @@ 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_COLOR_MATCHING);
if (ret)
return ret;
}
return ret;
@ -2067,6 +2114,12 @@ static int __uvcg_cnt_strm(void *priv1, void *priv2, void *priv3, int n,
*size += frm->frame.b_frame_interval_type * sz;
}
break;
case UVCG_COLOR_MATCHING: {
struct uvcg_color_matching *color_match = priv1;
*size += sizeof(color_match->desc);
}
break;
}
++*count;
@ -2152,6 +2205,13 @@ static int __uvcg_fill_strm(void *priv1, void *priv2, void *priv3, int n,
frm->frame.b_frame_interval_type);
}
break;
case UVCG_COLOR_MATCHING: {
struct uvcg_color_matching *color_match = priv1;
memcpy(*dest, &color_match->desc, sizeof(color_match->desc));
*dest += sizeof(color_match->desc);
}
break;
}
return 0;
@ -2191,7 +2251,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;
@ -2218,7 +2278,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;

14
drivers/usb/gadget/function/uvc_configfs.h
View File

@ -40,6 +40,7 @@ static inline struct uvcg_control_header *to_uvcg_control_header(struct config_i
struct uvcg_color_matching {
struct config_group group;
struct uvc_color_matching_descriptor desc;
unsigned int refcnt;
};
#define to_uvcg_color_matching(group_ptr) \
@ -51,12 +52,13 @@ enum uvcg_format_type {
};
struct uvcg_format {
struct config_group group;
enum uvcg_format_type type;
unsigned linked;
struct list_head frames;
unsigned num_frames;
__u8 bmaControls[UVCG_STREAMING_CONTROL_SIZE];
struct config_group group;
enum uvcg_format_type type;
unsigned linked;
struct list_head frames;
unsigned num_frames;
__u8 bmaControls[UVCG_STREAMING_CONTROL_SIZE];
struct uvcg_color_matching *color_matching;
};
struct uvcg_format_ptr {