From: Hans de Goede <hdegoede@redhat.com>
To: Hans Verkuil <hverkuil@xs4all.nl>,
Linux Media Mailing List <linux-media@vger.kernel.org>
Cc: regressions@lists.linux.dev,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
"Linux regression tracking (Thorsten Leemhuis)"
<regressions@leemhuis.info>
Subject: Re: [PATCH] media: usb: uvc: fill in description for unknown pixelformats
Date: Wed, 29 Mar 2023 20:36:33 +0200 [thread overview]
Message-ID: <ffdf7e17-580c-ed13-c37a-bd795e116427@redhat.com> (raw)
In-Reply-To: <4b1bc0d5-808b-816d-d7de-5baa8851e74f@xs4all.nl>
Hi,
On 3/29/23 14:28, Hans Verkuil wrote:
> If the fcc is 0 (indicating an unknown GUID format), then fill in the
> description field in ENUM_FMT. Otherwise the V4L2 core will WARN.
>
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
> Fixes: 50459f103edf ("media: uvcvideo: Remove format descriptions")
Thanks, patch looks good to me:
FWIW:
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Regards,
Hans
> ---
> diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
> index 7aefa76a42b3..2f1ced1212cd 100644
> --- a/drivers/media/usb/uvc/uvc_driver.c
> +++ b/drivers/media/usb/uvc/uvc_driver.c
> @@ -256,6 +256,9 @@ static int uvc_parse_format(struct uvc_device *dev,
> } else {
> dev_info(&streaming->intf->dev,
> "Unknown video format %pUl\n", &buffer[5]);
> + snprintf(format->name, sizeof(format->name), "%pUl\n",
> + &buffer[5]);
> +
> format->fcc = 0;
> }
>
> diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
> index 35453f81c1d9..fc6f9e7d8506 100644
> --- a/drivers/media/usb/uvc/uvc_v4l2.c
> +++ b/drivers/media/usb/uvc/uvc_v4l2.c
> @@ -713,6 +713,10 @@ static int uvc_ioctl_enum_fmt(struct uvc_streaming *stream,
> if (format->flags & UVC_FMT_FLAG_COMPRESSED)
> fmt->flags |= V4L2_FMT_FLAG_COMPRESSED;
> fmt->pixelformat = format->fcc;
> + if (format->name[0])
> + strscpy(fmt->description, format->name,
> + sizeof(fmt->description));
> +
> return 0;
> }
>
> diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
> index 9a596c8d894a..22656755a801 100644
> --- a/drivers/media/usb/uvc/uvcvideo.h
> +++ b/drivers/media/usb/uvc/uvcvideo.h
> @@ -264,6 +264,8 @@ struct uvc_format {
> u32 fcc;
> u32 flags;
>
> + char name[32];
> +
> unsigned int nframes;
> struct uvc_frame *frame;
> };
>
next prev parent reply other threads:[~2023-03-29 18:36 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-29 12:28 [PATCH] media: usb: uvc: fill in description for unknown pixelformats Hans Verkuil
2023-03-29 16:05 ` Ricardo Ribalda
2023-03-29 17:20 ` Hans Verkuil
2023-04-05 6:40 ` Laurent Pinchart
2023-04-19 6:23 ` Laurent Pinchart
2023-04-19 6:48 ` Hans Verkuil
2023-03-29 18:36 ` Hans de Goede [this message]
2023-04-11 11:49 ` Thorsten Leemhuis
2023-04-11 12:06 ` Laurent Pinchart
2023-04-11 12:26 ` Linux regression tracking (Thorsten Leemhuis)
2023-04-11 12:17 ` Ricardo Ribalda
2023-05-31 11:48 ` Linux regression tracking (Thorsten Leemhuis)
2023-05-31 12:44 ` Laurent Pinchart
2023-05-31 12:54 ` Linux regression tracking (Thorsten Leemhuis)
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=ffdf7e17-580c-ed13-c37a-bd795e116427@redhat.com \
--to=hdegoede@redhat.com \
--cc=hverkuil@xs4all.nl \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=regressions@leemhuis.info \
--cc=regressions@lists.linux.dev \
/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;
as well as URLs for NNTP newsgroup(s).