| Message ID | 20201215154439.69062-5-ribalda@chromium.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Show privacy_gpio as a v4l2_ctrl | expand |
Hi Ricardo, Thank you for the patch. Maybe s/Entity defined/Allow entity-defined/ in the subject line ? On Tue, Dec 15, 2020 at 04:44:34PM +0100, Ricardo Ribalda wrote: > Allows controls to get their properties and current value > from an entity-defined function instead of via a query to the USB > device. > > Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> > --- > drivers/media/usb/uvc/uvc_ctrl.c | 22 ++++++++++++++++++---- > drivers/media/usb/uvc/uvcvideo.h | 5 +++++ > 2 files changed, 23 insertions(+), 4 deletions(-) > > diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c > index 9f6174a10e73..531816762892 100644 > --- a/drivers/media/usb/uvc/uvc_ctrl.c > +++ b/drivers/media/usb/uvc/uvc_ctrl.c > @@ -980,10 +980,20 @@ static int __uvc_ctrl_get(struct uvc_video_chain *chain, > return -EACCES; > > if (!ctrl->loaded) { > - ret = uvc_query_ctrl(chain->dev, UVC_GET_CUR, ctrl->entity->id, > - chain->dev->intfnum, ctrl->info.selector, > + if (ctrl->entity->get_cur) { > + ret = ctrl->entity->get_cur(chain->dev, > + ctrl->entity, > + ctrl->info.selector, > uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT), > ctrl->info.size); > + } else { > + ret = uvc_query_ctrl(chain->dev, UVC_GET_CUR, > + ctrl->entity->id, > + chain->dev->intfnum, > + ctrl->info.selector, > + uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT), > + ctrl->info.size); We could possibly set entity->get_cur by default to a function wrapping uvc_query_ctrl() to avoid the condition here. This isn't mandatory for now though, but I'll toy with it on top of the series to avoid storing function pointers in a non-const structure. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > + } > if (ret < 0) > return ret; > > @@ -1687,8 +1697,12 @@ static int uvc_ctrl_get_flags(struct uvc_device *dev, > if (data == NULL) > return -ENOMEM; > > - ret = uvc_query_ctrl(dev, UVC_GET_INFO, ctrl->entity->id, dev->intfnum, > - info->selector, data, 1); > + 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); > if (!ret) > info->flags |= (data[0] & UVC_CONTROL_CAP_GET ? > UVC_CTRL_FLAG_GET_CUR : 0) > diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h > index 00f985001c1d..ae464ba83f4f 100644 > --- a/drivers/media/usb/uvc/uvcvideo.h > +++ b/drivers/media/usb/uvc/uvcvideo.h > @@ -353,6 +353,11 @@ 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; > }; -- Regards, Laurent Pinchart
diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index 9f6174a10e73..531816762892 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -980,10 +980,20 @@ static int __uvc_ctrl_get(struct uvc_video_chain *chain, return -EACCES; if (!ctrl->loaded) { - ret = uvc_query_ctrl(chain->dev, UVC_GET_CUR, ctrl->entity->id, - chain->dev->intfnum, ctrl->info.selector, + if (ctrl->entity->get_cur) { + ret = ctrl->entity->get_cur(chain->dev, + ctrl->entity, + ctrl->info.selector, uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT), ctrl->info.size); + } else { + ret = uvc_query_ctrl(chain->dev, UVC_GET_CUR, + ctrl->entity->id, + chain->dev->intfnum, + ctrl->info.selector, + uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT), + ctrl->info.size); + } if (ret < 0) return ret; @@ -1687,8 +1697,12 @@ static int uvc_ctrl_get_flags(struct uvc_device *dev, if (data == NULL) return -ENOMEM; - ret = uvc_query_ctrl(dev, UVC_GET_INFO, ctrl->entity->id, dev->intfnum, - info->selector, data, 1); + 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); if (!ret) info->flags |= (data[0] & UVC_CONTROL_CAP_GET ? UVC_CTRL_FLAG_GET_CUR : 0) diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 00f985001c1d..ae464ba83f4f 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -353,6 +353,11 @@ 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; };
Allows controls to get their properties and current value from an entity-defined function instead of via a query to the USB device. Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> --- drivers/media/usb/uvc/uvc_ctrl.c | 22 ++++++++++++++++++---- drivers/media/usb/uvc/uvcvideo.h | 5 +++++ 2 files changed, 23 insertions(+), 4 deletions(-)