media: uvcvideo: Implement the Privacy GPIO as a subdevice
Subsystems (4)
cover media: uvcvideo: Implement the Privacy GPIO as a subdevice
Some notebooks have a button to disable the camera (not to be mistaken with the mechanical cover). This is a standard GPIO linked to the camera via the ACPI table.
4 years ago we added support for this button in UVC via the Privacy control. This has two issues:
- If the camera has its own privacy control, it will be masked
- We need to power-up the camera to read the privacy control gpio.
We tried to fix the power-up issues implementing "granular power saving" but it has been more complicated than anticipated....
Last year, we proposed a patchset to implement the privacy gpio as a
subdevice https://lore.kernel.org/linux-media/[email protected]/
I think it is a pretty clean solution and makes sense to use a subdevice for something that is a sub device of the camera :).
This is an attempt to continue with that approach.
Tested on gimble:
gimble-rev3 ~ # v4l2-ctl --all -d /dev/v4l-subdev0 Driver Info:
Driver version : 6.6.56
Capabilities : 0x00000000
Media Driver Info:
Driver name : uvcvideo
Model : HP 5M Camera: HP 5M Camera
Serial : 0001
Bus info : usb-0000:00:14.0-6
Media version : 6.6.56
Hardware revision: 0x00009601 (38401)
Driver version : 6.6.56Interface Info:
ID : 0x0300001d
Type : V4L Sub-Device
Entity Info:
ID : 0x00000013 (19)
Name : GPIO
Function : Analog Video DecoderCamera Controls
privacy 0x009a0910 (bool) : default=0 value=0 flags=read-only, volatile
gimble-rev3 ~ # media-ctl -p
Media controller API version 6.6.56
Media device information
------------------------
driver uvcvideo model HP 5M Camera: HP 5M Camera serial 0001 bus info usb-0000:00:14.0-6 hw revision 0x9601 driver version 6.6.56
Device topology
- entity 1: HP 5M Camera: HP 5M Camera (1 pad, 1 link) type Node subtype V4L flags 1 device node name /dev/video0
pad0: Sink
<- "Extension 8":1 [ENABLED,IMMUTABLE]
- entity 4: HP 5M Camera: HP 5M Camera (0 pad, 0 link) type Node subtype V4L flags 0 device node name /dev/video1
- entity 8: Extension 8 (2 pads, 2 links, 0 routes)
type V4L2 subdev subtype Unknown flags 0
pad0: Sink
<- "Extension 4":1 [ENABLED,IMMUTABLE]
pad1: Source
-> "HP 5M Camera: HP 5M Camera":0 [ENABLED,IMMUTABLE]- entity 11: Extension 4 (2 pads, 2 links, 0 routes)
type V4L2 subdev subtype Unknown flags 0
pad0: Sink
<- "Processing 2":1 [ENABLED,IMMUTABLE]
pad1: Source
-> "Extension 8":0 [ENABLED,IMMUTABLE]- entity 14: Processing 2 (2 pads, 2 links, 0 routes)
type V4L2 subdev subtype Unknown flags 0
pad0: Sink
<- "Camera 1":0 [ENABLED,IMMUTABLE]
pad1: Source
-> "Extension 4":0 [ENABLED,IMMUTABLE]- entity 17: Camera 1 (1 pad, 1 link, 0 routes) type V4L2 subdev subtype Sensor flags 0
pad0: Source
-> "Processing 2":0 [ENABLED,IMMUTABLE]
- entity 19: GPIO (0 pad, 0 link, 0 routes) type V4L2 subdev subtype Decoder flags 0 device node name /dev/v4l-subdev0
---
Ricardo Ribalda (6):
media: uvcvideo: Factor out gpio functions to its own file Revert "media: uvcvideo: Allow entity-defined get_info and get_cur"
media: uvcvideo: Create ancillary link for GPIO subdevice
media: v4l2-core: Add new MEDIA_ENT_F_GPIO
media: uvcvideo: Use MEDIA_ENT_F_GPIO for the GPIO entity
media: uvcvideo: Introduce UVC_QUIRK_PRIVACY_DURING_STREAM
Yunke Cao (1):
media: uvcvideo: reimplement privacy GPIO as a separate subdevice
.../userspace-api/media/mediactl/media-types.rst | 4 + drivers/media/usb/uvc/Makefile | 3 +- drivers/media/usb/uvc/uvc_ctrl.c | 40 +---- drivers/media/usb/uvc/uvc_driver.c | 112 +------------ drivers/media/usb/uvc/uvc_entity.c | 20 ++- drivers/media/usb/uvc/uvc_gpio.c | 178 +++++++++++++++++++++ drivers/media/usb/uvc/uvc_video.c | 4 + drivers/media/usb/uvc/uvcvideo.h | 31 ++-- drivers/media/v4l2-core/v4l2-async.c | 3 +- include/uapi/linux/media.h | 1 + 10 files changed, 242 insertions(+), 154 deletions(-)
---
base-commit: c7ccf3683ac9746b263b0502255f5ce47f64fe0a
change-id: 20241030-uvc-subdev-89f4467a00b5
Best regards,
Signature · 1 line
Ricardo Ribalda <[email protected]>
PATCH 1/7 media: uvcvideo: Factor out gpio functions to its own file
This is just a refactor patch, no new functionality is added.
--- drivers/media/usb/uvc/Makefile | 3 +- drivers/media/usb/uvc/uvc_driver.c | 107 ++----------------------------------- drivers/media/usb/uvc/uvc_gpio.c | 107 +++++++++++++++++++++++++++++++++++++ drivers/media/usb/uvc/uvcvideo.h | 7 +++ 4 files changed, 119 insertions(+), 105 deletions(-)
drivers/media/usb/uvc/Makefile +2 -1
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 uvcvideo-objs := uvc_driver.o uvc_queue.o uvc_v4l2.o uvc_video.o uvc_ctrl.o \ - uvc_status.o uvc_isight.o uvc_debugfs.o uvc_metadata.o + uvc_status.o uvc_isight.o uvc_debugfs.o uvc_metadata.o \ + uvc_gpio.o ifeq ($(CONFIG_MEDIA_CONTROLLER),y) uvcvideo-objs += uvc_entity.o endif
drivers/media/usb/uvc/uvc_driver.c +3 -104
125 lines not on this page · raw message
drivers/media/usb/uvc/uvc_gpio.c new file +107 -0
107 lines not on this page · raw message
drivers/media/usb/uvc/uvcvideo.h +7 -0
@@ -672,6 +672,9 @@ do { \extern struct uvc_driver uvc_driver;struct uvc_entity *uvc_entity_by_id (struct uvc_device *dev,int id); +struct uvc_entity *uvc_alloc_new_entity (struct uvc_device *dev,u16 type, +u16 id,unsigned int num_pads, +unsigned int extra_size);/* Video buffers queue management. */ int uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type,
@@ -816,4 +819,8 @@ void uvc_debugfs_cleanup_stream(struct uvc_streaming *stream);size_t uvc_video_stats_dump (struct uvc_streaming *stream,char *buf,size_t size); +/* gpio */ +int uvc_gpio_init_irq (struct uvc_device *dev); +int uvc_gpio_parse (struct uvc_device *dev); +#endif
Signature · 1 line
2.47.0.163.g1226f6d8fa-goog
PATCH 2/7 media: uvcvideo: reimplement privacy GPIO as a separate subdevice
In reply to Ricardo RibaldaFrom: Yunke Cao <[email protected]>
Reimplement privacy GPIO as a v4l2 subdev with a volatile privacy control. A v4l2 control event is sent in irq when privacy control value changes.
The behavior matches the original implementation, except that the control is of a separate subdevice.
V4L2 control kAPI is used for simplicity.
--- drivers/media/usb/uvc/uvc_ctrl.c | 20 ------- drivers/media/usb/uvc/uvc_driver.c | 5 +- drivers/media/usb/uvc/uvc_entity.c | 6 ++ drivers/media/usb/uvc/uvc_gpio.c | 118 ++++++++++++++++++++++--------------- drivers/media/usb/uvc/uvcvideo.h | 18 +++--- 5 files changed, 92 insertions(+), 75 deletions(-)
drivers/media/usb/uvc/uvc_ctrl.c +0 -20
@@ -350,14 +350,6 @@ static const struct uvc_control_info uvc_ctrls[] = { | UVC_CTRL_FLAG_RESTORE | UVC_CTRL_FLAG_AUTO_UPDATE, }, - { - .entity = UVC_GUID_EXT_GPIO_CONTROLLER, - .selector = UVC_CT_PRIVACY_CONTROL, - .index = 0, - .size = 1, - .flags = UVC_CTRL_FLAG_GET_CUR - | UVC_CTRL_FLAG_AUTO_UPDATE, - }, }; static const u32 uvc_control_classes[] = {
@@ -827,15 +819,6 @@ static const struct uvc_control_mapping uvc_ctrl_mappings[] = { .v4l2_type = V4L2_CTRL_TYPE_BOOLEAN, .data_type = UVC_CTRL_DATA_TYPE_BOOLEAN, }, - { - .id = V4L2_CID_PRIVACY, - .entity = UVC_GUID_EXT_GPIO_CONTROLLER, - .selector = UVC_CT_PRIVACY_CONTROL, - .size = 1, - .offset = 0, - .v4l2_type = V4L2_CTRL_TYPE_BOOLEAN, - .data_type = UVC_CTRL_DATA_TYPE_BOOLEAN, - }, { .entity = UVC_GUID_UVC_PROCESSING, .selector = UVC_PU_POWER_LINE_FREQUENCY_CONTROL,
@@ -2718,9 +2701,6 @@ static int uvc_ctrl_init_chain(struct uvc_video_chain *chain) }else if (UVC_ENTITY_TYPE (entity) ==UVC_ITT_CAMERA ) { bmControls = entity->camera.bmControls; bControlSize = entity->camera.bControlSize; - }else if (UVC_ENTITY_TYPE (entity) ==UVC_EXT_GPIO_UNIT ) { - bmControls = entity->gpio.bmControls; - bControlSize = entity->gpio.bControlSize; }/* Remove bogus/blacklisted controls */
drivers/media/usb/uvc/uvc_driver.c +4 -1
@@ -2169,6 +2169,7 @@ static int uvc_probe(struct usb_interface *intf,if (media_device_register (&dev->mdev) <0 ) goto error;#endif +/* Save our data pointer in the interface data. */ usb_set_intfdata (intf, dev);
@@ -2180,7 +2181,7 @@ static int uvc_probe(struct usb_interface *intf, ret); } - ret =uvc_gpio_init_irq (dev); + ret =uvc_gpio_init (dev);if (ret <0 ) {dev_err (&dev->udev->dev,"Unable to request privacy GPIO IRQ (%d)\n" , ret);
@@ -2207,6 +2208,8 @@ static void uvc_disconnect(struct usb_interface *intf) {struct uvc_device *dev =usb_get_intfdata (intf); +uvc_gpio_cleanup (dev->gpio_unit); +/* * Set the USB interface data to NULL. This can be done outside the * lock, as there's no other reader.
drivers/media/usb/uvc/uvc_entity.c +6 -0
@@ -56,7 +56,13 @@ static int uvc_mc_create_links(struct uvc_video_chain *chain,return 0 ; } +static const struct v4l2_subdev_core_ops uvc_subdev_core_ops = { + .subscribe_event = v4l2_ctrl_subdev_subscribe_event, + .unsubscribe_event = v4l2_event_subdev_unsubscribe, +}; +static const struct v4l2_subdev_ops uvc_subdev_ops = { + .core = &uvc_subdev_core_ops, };void uvc_mc_cleanup_entity (struct uvc_entity *entity)
drivers/media/usb/uvc/uvc_gpio.c +71 -47
171 lines not on this page · raw message
drivers/media/usb/uvc/uvcvideo.h +11 -7
@@ -15,6 +15,7 @@#include <linux/videodev2.h> #include <linux/workqueue.h> #include <media/media-device.h> +#include <media/v4l2-ctrls.h> #include <media/v4l2-device.h> #include <media/v4l2-event.h> #include <media/v4l2-fh.h>
@@ -171,6 +172,13 @@ struct uvc_control {#define UVC_ENTITY_FLAG_DEFAULT (1 << 0) +struct uvc_gpio { +struct gpio_desc *gpio_privacy; +int irq; +struct v4l2_ctrl_handler hdl; +struct v4l2_ctrl *privacy_ctrl; +}; +struct uvc_entity {struct list_head list;/* Entity as part of a UVC device. */ struct list_head chain;/* Entity as part of a video device chain. */
@@ -229,12 +237,7 @@ struct uvc_entity {u8 *bmControlsType; } extension; -struct { -u8 bControlSize; -u8 *bmControls; -struct gpio_desc *gpio_privacy; -int irq; - } gpio; +struct uvc_gpio gpio; };u8 bNrInPins;
@@ -820,7 +823,8 @@ size_t uvc_video_stats_dump(struct uvc_streaming *stream, char *buf, size_t size);/* gpio */ -int uvc_gpio_init_irq (struct uvc_device *dev); +int uvc_gpio_init (struct uvc_device *dev);int uvc_gpio_parse (struct uvc_device *dev); +void uvc_gpio_cleanup (struct uvc_entity *entity);#endif
Signature · 1 line
2.47.0.163.g1226f6d8fa-goog
PATCH 3/7 Revert "media: uvcvideo: Allow entity-defined get_info and get_cur"
In reply to Ricardo RibaldaWith the privacy gpio now handled as a subdevice, there is no more need for this.
This reverts commit 65900c581d014499f0f8ceabfc02c652e9a88771.
--- drivers/media/usb/uvc/uvc_ctrl.c | 20 +++++--------------- drivers/media/usb/uvc/uvcvideo.h | 5 ----- 2 files changed, 5 insertions(+), 20 deletions(-)
drivers/media/usb/uvc/uvc_ctrl.c +5 -15
@@ -1087,15 +1087,9 @@ static int __uvc_ctrl_load_cur(struct uvc_video_chain *chain,return 0 ; } -if (ctrl->entity->get_cur) - ret = ctrl->entity->get_cur (chain->dev, ctrl->entity, - ctrl->info.selector, data, - ctrl->info.size); -else - ret =uvc_query_ctrl (chain->dev,UVC_GET_CUR , - ctrl->entity->id, chain->dev->intfnum, - ctrl->info.selector, data, - ctrl->info.size); + ret =uvc_query_ctrl (chain->dev,UVC_GET_CUR , ctrl->entity->id, + chain->dev->intfnum, ctrl->info.selector, data, + ctrl->info.size);if (ret <0 )return ret;
@@ -2055,12 +2049,8 @@ static int uvc_ctrl_get_flags(struct uvc_device *dev,if (data ==NULL )return -ENOMEM ; -if (ctrl->entity->get_info) - ret = ctrl->entity->get_info (dev, ctrl->entity, - ctrl->info.selector, data); -else - ret =uvc_query_ctrl (dev,UVC_GET_INFO , ctrl->entity->id, - dev->intfnum, info->selector, data,1 ); + ret =uvc_query_ctrl (dev,UVC_GET_INFO , ctrl->entity->id, dev->intfnum, + info->selector, data,1 );if (!ret) { info->flags &= ~(UVC_CTRL_FLAG_GET_CUR |
drivers/media/usb/uvc/uvcvideo.h +0 -5
@@ -243,11 +243,6 @@ struct uvc_entity {u8 bNrInPins;u8 *baSourceID; -int (*get_info)(struct uvc_device *dev,struct uvc_entity *entity, -u8 cs,u8 *caps); -int (*get_cur)(struct uvc_device *dev,struct uvc_entity *entity, -u8 cs,void *data,u16 size); -unsigned int ncontrols;struct uvc_control *controls; };
Signature · 1 line
2.47.0.163.g1226f6d8fa-goog
PATCH 4/7 media: uvcvideo: Create ancillary link for GPIO subdevice
In reply to Ricardo RibaldaMake an ancillary device between the streaming subdevice and the GPIO subdevice.
--- drivers/media/usb/uvc/uvc_entity.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/media/usb/uvc/uvc_entity.c +10 -0
@@ -53,6 +53,16 @@ static int uvc_mc_create_links(struct uvc_video_chain *chain,return ret; } +/* Create ancillary link for the GPIO. */ +if (chain->dev->gpio_unit &&UVC_ENTITY_TYPE (entity) ==UVC_ITT_CAMERA ) { +struct media_link *link; + + link =media_create_ancillary_link (sink, + &chain->dev->gpio_unit->subdev.entity); +if (IS_ERR (link)) +return PTR_ERR (link); + } +return 0 ; }
Signature · 1 line
2.47.0.163.g1226f6d8fa-goog
PATCH 5/7 media: v4l2-core: Add new MEDIA_ENT_F_GPIO
In reply to Ricardo RibaldaAdd a new media entity type to define a GPIO entity. This can be used to represent the privacy switch GPIO associated to a sensor.
--- Documentation/userspace-api/media/mediactl/media-types.rst | 4 ++++ drivers/media/v4l2-core/v4l2-async.c | 3 ++- include/uapi/linux/media.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-)
Documentation/userspace-api/media/mediactl/media-types.rst +4 -0
@@ -24,6 +24,7 @@ Types and flags used to represent the media graph elements .. _MEDIA-ENT-F-CAM-SENSOR: .. _MEDIA-ENT-F-FLASH: .. _MEDIA-ENT-F-LENS: +.. _MEDIA-ENT-F-GPIO: .. _MEDIA-ENT-F-ATV-DECODER: .. _MEDIA-ENT-F-TUNER: .. _MEDIA-ENT-F-IF-VID-DECODER:
@@ -100,6 +101,9 @@ Types and flags used to represent the media graph elements * - ``MEDIA_ENT_F_LENS`` - Lens controller entity. + * - ``MEDIA_ENT_F_GPIO`` + - GPIO controller entity. + * - ``MEDIA_ENT_F_ATV_DECODER`` - Analog video decoder, the basic function of the video decoder is to accept analogue video from a wide variety of sources such as
drivers/media/v4l2-core/v4l2-async.c +2 -1
@@ -320,7 +320,8 @@ static int v4l2_async_create_ancillary_links(struct v4l2_async_notifier *n,struct media_link *link;if (sd->entity.function !=MEDIA_ENT_F_LENS && - sd->entity.function !=MEDIA_ENT_F_FLASH ) + sd->entity.function !=MEDIA_ENT_F_FLASH && + sd->entity.function !=MEDIA_ENT_F_GPIO )return 0 ;if (!n->sd) {
include/uapi/linux/media.h +1 -0
@@ -84,6 +84,7 @@ struct media_device_info {#define MEDIA_ENT_F_CAM_SENSOR (MEDIA_ENT_F_OLD_SUBDEV_BASE + 1)#define MEDIA_ENT_F_FLASH (MEDIA_ENT_F_OLD_SUBDEV_BASE + 2)#define MEDIA_ENT_F_LENS (MEDIA_ENT_F_OLD_SUBDEV_BASE + 3) +#define MEDIA_ENT_F_GPIO (MEDIA_ENT_F_OLD_SUBDEV_BASE + 4)/* * Digital TV, analog TV, radio and/or software defined radio tuner functions.
Signature · 1 line
2.47.0.163.g1226f6d8fa-goog
PATCH 6/7 media: uvcvideo: Use MEDIA_ENT_F_GPIO for the GPIO entity
In reply to Ricardo RibaldaRight now we are setting the entity type to unknown for the privacy GPIO entity. Which results in the following error in dmesg. uvcvideo 3-6:1.0: Entity type for entity GPIO was not initialized!
Use the newly created type to fix this.
--- drivers/media/usb/uvc/uvc_entity.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/usb/uvc/uvc_entity.c +3 -1
@@ -114,6 +114,9 @@ static int uvc_mc_init_entity(struct uvc_video_chain *chain,case UVC_ITT_CAMERA : function =MEDIA_ENT_F_CAM_SENSOR ;break ; +case UVC_EXT_GPIO_UNIT : + function =MEDIA_ENT_F_GPIO ; +break ;case UVC_TT_VENDOR_SPECIFIC :case UVC_ITT_VENDOR_SPECIFIC :case UVC_ITT_MEDIA_TRANSPORT_INPUT :
@@ -121,7 +124,6 @@ static int uvc_mc_init_entity(struct uvc_video_chain *chain,case UVC_OTT_DISPLAY :case UVC_OTT_MEDIA_TRANSPORT_OUTPUT :case UVC_EXTERNAL_VENDOR_SPECIFIC : -case UVC_EXT_GPIO_UNIT :default : function =MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN ;break ;
Signature · 1 line
2.47.0.163.g1226f6d8fa-goog
Re: [PATCH 6/7] media: uvcvideo: Use MEDIA_ENT_F_GPIO for the GPIO entity
Quoted 3 lines · Ricardo Ribalda
Right now we are setting the entity type to unknown for the privacy GPIO entity. Which results in the following error in dmesg. uvcvideo 3-6:1.0: Entity type for entity GPIO was not initialized!
Should this be squashed with the previous patch?
PATCH 7/7 media: uvcvideo: Introduce UVC_QUIRK_PRIVACY_DURING_STREAM
In reply to Ricardo RibaldaSome devices power the GPIO pull-up with the same power-supply as the camera. Avoid reading the GPIO if the device is not streaming.
--- drivers/media/usb/uvc/uvc_gpio.c | 47 +++++++++++++++++++++++++++++++++++++++ drivers/media/usb/uvc/uvc_video.c | 4 ++++ drivers/media/usb/uvc/uvcvideo.h | 7 ++++-- 3 files changed, 56 insertions(+), 2 deletions(-)
drivers/media/usb/uvc/uvc_gpio.c +47 -0
@@ -5,6 +5,7 @@* Copyright 2024 Google LLC */ +#include <linux/dmi.h> #include <linux/kernel.h> #include <linux/gpio/consumer.h> #include <media/v4l2-ctrls.h>
@@ -16,6 +17,9 @@ static int uvc_gpio_g_volatile_ctrl(struct v4l2_ctrl *ctrl)struct uvc_gpio *gpio = container_of(ctrl->handler, struct uvc_gpio, hdl); +if (!gpio->gpio_ready) +return -EBUSY ; + ret =gpiod_get_value_cansleep (gpio->gpio_privacy);if (ret <0 )return ret;
@@ -43,6 +47,24 @@ static irqreturn_t uvc_gpio_irq(int irq, void *data)return IRQ_HANDLED ; } +static const struct dmi_system_id privacy_valid_during_streamon[] = { + { + .ident ="HP Elite c1030 Chromebook" , + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"HP" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Jinlon" ), + }, + }, + { + .ident ="HP Pro c640 Chromebook" , + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"HP" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Dratini" ), + }, + }, + { }/* terminate list */ +}; +int uvc_gpio_parse (struct uvc_device *dev) {struct gpio_desc *gpio_privacy;
@@ -64,6 +86,15 @@ int uvc_gpio_parse(struct uvc_device *dev)if (IS_ERR (unit))return PTR_ERR (unit); +/* +* Note: This quirk will not match external UVC cameras, +* as they will not have the corresponding ACPI GPIO entity. +*/ +if (dmi_check_system (privacy_valid_during_streamon)) + dev->quirks |=UVC_QUIRK_PRIVACY_DURING_STREAM ; +else + unit->gpio.gpio_ready = true; + unit->gpio.gpio_privacy = gpio_privacy; unit->gpio.irq = irq;strscpy (unit->name,"GPIO" ,sizeof (unit->name));
@@ -74,6 +105,20 @@ int uvc_gpio_parse(struct uvc_device *dev)return 0 ; } +void uvc_gpio_quirk (struct uvc_device *dev,bool stream_on) +{ +if (!dev->gpio_unit || !(dev->quirks &UVC_QUIRK_PRIVACY_DURING_STREAM )) +return ; + + dev->gpio_unit->gpio.gpio_ready = stream_on; +if (stream_on) { +enable_irq (dev->gpio_unit->gpio.irq); +uvc_gpio_irq (0 , &dev->gpio_unit->gpio); + }else { +disable_irq (dev->gpio_unit->gpio.irq); + } +} +int uvc_gpio_init (struct uvc_device *dev) {struct uvc_entity *unit = dev->gpio_unit;
@@ -97,6 +142,8 @@ int uvc_gpio_init(struct uvc_device *dev) goto cleanup; } +uvc_gpio_quirk (dev, false); + unit->gpio.privacy_ctrl->flags |=V4L2_CTRL_FLAG_VOLATILE |V4L2_CTRL_FLAG_READ_ONLY ;
drivers/media/usb/uvc/uvc_video.c +4 -0
@@ -2296,6 +2296,8 @@ int uvc_video_start_streaming(struct uvc_streaming *stream)if (ret <0 ) goto error_video; +uvc_gpio_quirk (stream->dev, true); +return 0 ; error_video:
@@ -2308,6 +2310,8 @@ int uvc_video_start_streaming(struct uvc_streaming *stream)void uvc_video_stop_streaming (struct uvc_streaming *stream) { +uvc_gpio_quirk (stream->dev, false); +uvc_video_stop_transfer (stream,1 );if (stream->intf->num_altsetting >1 ) {
drivers/media/usb/uvc/uvcvideo.h +5 -2
@@ -77,6 +77,7 @@#define UVC_QUIRK_NO_RESET_RESUME 0x00004000#define UVC_QUIRK_DISABLE_AUTOSUSPEND 0x00008000#define UVC_QUIRK_INVALID_DEVICE_SOF 0x00010000 +#define UVC_QUIRK_PRIVACY_DURING_STREAM 0x00020000/* Format flags */ #define UVC_FMT_FLAG_COMPRESSED 0x00000001
@@ -173,10 +174,11 @@ struct uvc_control {#define UVC_ENTITY_FLAG_DEFAULT (1 << 0)struct uvc_gpio { -struct gpio_desc *gpio_privacy; +bool gpio_ready;int irq; -struct v4l2_ctrl_handler hdl;struct v4l2_ctrl *privacy_ctrl; +struct v4l2_ctrl_handler hdl; +struct gpio_desc *gpio_privacy; };struct uvc_entity {
@@ -821,5 +823,6 @@ size_t uvc_video_stats_dump(struct uvc_streaming *stream, char *buf,int uvc_gpio_init (struct uvc_device *dev);int uvc_gpio_parse (struct uvc_device *dev);void uvc_gpio_cleanup (struct uvc_entity *entity); +void uvc_gpio_quirk (struct uvc_device *dev,bool stream_on);#endif
Signature · 1 line
2.47.0.163.g1226f6d8fa-goog