| Message ID | 20240617202800.GA19966@pendragon.ideasonboard.com |
|---|---|
| State | New |
| Headers | show |
| Series | [GIT,PULL,v2,FOR,v6.11] uvcvideo fixes and improvements | expand |
Em Mon, 17 Jun 2024 23:28:00 +0300 Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu: > Hi Hans, Mauro, > > The following changes since commit 91798162245991e26949ef62851719bb2177a9c2: > > media: v4l: add missing MODULE_DESCRIPTION() macros (2024-06-15 11:16:40 +0200) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/pinchartl/linux.git tags/media-next-uvc-20240617-2 > > for you to fetch changes up to 8c40efeda94108d65c52038ea82ee83b2fb933e2: > > media: uvcvideo: Remove mappings form uvc_device_info (2024-06-17 23:21:13 +0300) > > ---------------------------------------------------------------- > uvcvideo fixes and improvements > > ---------------------------------------------------------------- > Daniel Schaefer (1): > media: uvcvideo: Override default flags > > Laurent Pinchart (1): > media: uvcvideo: Force UVC version to 1.0a for 0408:4035 > > Michal Pecio (1): > media: uvcvideo: Fix the bandwdith quirk on USB 3.x > > Oleksandr Natalenko (1): > media: uvcvideo: Add quirk for invalid dev_sof in Logitech C920 > > Ricardo Ribalda (14): > media: uvcvideo: Support timestamp lists of any size > media: uvcvideo: Ignore empty TS packets > media: uvcvideo: Quirk for invalid dev_sof in Logitech C922 > media: uvcvideo: Allow hw clock updates with buffers not full > media: uvcvideo: Refactor clock circular buffer > media: uvcvideo: Fix hw timestamp handling for slow FPS > media: uvcvideo: Fix integer overflow calculating timestamp > media: uvcvideo: Enforce alignment of frame and interval > media: uvcvideo: Allow custom control mapping > media: uvcvideo: Refactor Power Line Frequency limit selection > media: uvcvideo: Probe the PLF characteristics > media: uvcvideo: Cleanup version-specific mapping > media: uvcvideo: Remove PLF device quirking > media: uvcvideo: Remove mappings form uvc_device_info > > drivers/media/usb/uvc/uvc_ctrl.c | 193 +++++++++++++++++++++---------------- > drivers/media/usb/uvc/uvc_driver.c | 160 ++++++------------------------ > drivers/media/usb/uvc/uvc_video.c | 169 ++++++++++++++++++++++---------- > drivers/media/usb/uvc/uvcvideo.h | 10 +- > 4 files changed, 261 insertions(+), 271 deletions(-) > Hmm... while the PR has 18 patches, after applying this series on the top of media-stage, there is just one hunk at the diffstat: $ git diff 2c25dcc23619 diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index 4fe26e82e3d1..8557b8ef2ec2 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -2692,6 +2692,10 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain, } __uvc_ctrl_add_mapping(chain, ctrl, mapping); + + if (uvc_entity_match_guid(ctrl->entity, mapping->entity) && + ctrl->info.selector == mapping->selector) + __uvc_ctrl_add_mapping(chain, ctrl, mapping); } } Perhaps this was already applied but you forgot to update patchwork? If not the case, please rebase this branch and submit only the patch which adds the new logic. Regards
On 05/08/2024 09:04, Mauro Carvalho Chehab wrote: > Em Mon, 17 Jun 2024 23:28:00 +0300 > Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu: > >> Hi Hans, Mauro, >> >> The following changes since commit 91798162245991e26949ef62851719bb2177a9c2: >> >> media: v4l: add missing MODULE_DESCRIPTION() macros (2024-06-15 11:16:40 +0200) >> >> are available in the Git repository at: >> >> git://git.kernel.org/pub/scm/linux/kernel/git/pinchartl/linux.git tags/media-next-uvc-20240617-2 >> >> for you to fetch changes up to 8c40efeda94108d65c52038ea82ee83b2fb933e2: >> >> media: uvcvideo: Remove mappings form uvc_device_info (2024-06-17 23:21:13 +0300) >> >> ---------------------------------------------------------------- >> uvcvideo fixes and improvements >> >> ---------------------------------------------------------------- >> Daniel Schaefer (1): >> media: uvcvideo: Override default flags >> >> Laurent Pinchart (1): >> media: uvcvideo: Force UVC version to 1.0a for 0408:4035 >> >> Michal Pecio (1): >> media: uvcvideo: Fix the bandwdith quirk on USB 3.x >> >> Oleksandr Natalenko (1): >> media: uvcvideo: Add quirk for invalid dev_sof in Logitech C920 >> >> Ricardo Ribalda (14): >> media: uvcvideo: Support timestamp lists of any size >> media: uvcvideo: Ignore empty TS packets >> media: uvcvideo: Quirk for invalid dev_sof in Logitech C922 >> media: uvcvideo: Allow hw clock updates with buffers not full >> media: uvcvideo: Refactor clock circular buffer >> media: uvcvideo: Fix hw timestamp handling for slow FPS >> media: uvcvideo: Fix integer overflow calculating timestamp >> media: uvcvideo: Enforce alignment of frame and interval >> media: uvcvideo: Allow custom control mapping >> media: uvcvideo: Refactor Power Line Frequency limit selection >> media: uvcvideo: Probe the PLF characteristics >> media: uvcvideo: Cleanup version-specific mapping >> media: uvcvideo: Remove PLF device quirking >> media: uvcvideo: Remove mappings form uvc_device_info >> >> drivers/media/usb/uvc/uvc_ctrl.c | 193 +++++++++++++++++++++---------------- >> drivers/media/usb/uvc/uvc_driver.c | 160 ++++++------------------------ >> drivers/media/usb/uvc/uvc_video.c | 169 ++++++++++++++++++++++---------- >> drivers/media/usb/uvc/uvcvideo.h | 10 +- >> 4 files changed, 261 insertions(+), 271 deletions(-) >> > > Hmm... while the PR has 18 patches, after applying this series on the top of > media-stage, there is just one hunk at the diffstat: > > $ git diff 2c25dcc23619 > diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c > index 4fe26e82e3d1..8557b8ef2ec2 100644 > --- a/drivers/media/usb/uvc/uvc_ctrl.c > +++ b/drivers/media/usb/uvc/uvc_ctrl.c > @@ -2692,6 +2692,10 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain, > } > > __uvc_ctrl_add_mapping(chain, ctrl, mapping); > + > + if (uvc_entity_match_guid(ctrl->entity, mapping->entity) && > + ctrl->info.selector == mapping->selector) > + __uvc_ctrl_add_mapping(chain, ctrl, mapping); > } > } > > Perhaps this was already applied but you forgot to update patchwork? It's already applied. I might have forgotten to mark this PR as 'Accepted'. Regards, Hans > > If not the case, please rebase this branch and submit only the patch > which adds the new logic. > > Regards
Hi Hans, Mauro, The following changes since commit 91798162245991e26949ef62851719bb2177a9c2: media: v4l: add missing MODULE_DESCRIPTION() macros (2024-06-15 11:16:40 +0200) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/pinchartl/linux.git tags/media-next-uvc-20240617-2 for you to fetch changes up to 8c40efeda94108d65c52038ea82ee83b2fb933e2: media: uvcvideo: Remove mappings form uvc_device_info (2024-06-17 23:21:13 +0300) ---------------------------------------------------------------- uvcvideo fixes and improvements ---------------------------------------------------------------- Daniel Schaefer (1): media: uvcvideo: Override default flags Laurent Pinchart (1): media: uvcvideo: Force UVC version to 1.0a for 0408:4035 Michal Pecio (1): media: uvcvideo: Fix the bandwdith quirk on USB 3.x Oleksandr Natalenko (1): media: uvcvideo: Add quirk for invalid dev_sof in Logitech C920 Ricardo Ribalda (14): media: uvcvideo: Support timestamp lists of any size media: uvcvideo: Ignore empty TS packets media: uvcvideo: Quirk for invalid dev_sof in Logitech C922 media: uvcvideo: Allow hw clock updates with buffers not full media: uvcvideo: Refactor clock circular buffer media: uvcvideo: Fix hw timestamp handling for slow FPS media: uvcvideo: Fix integer overflow calculating timestamp media: uvcvideo: Enforce alignment of frame and interval media: uvcvideo: Allow custom control mapping media: uvcvideo: Refactor Power Line Frequency limit selection media: uvcvideo: Probe the PLF characteristics media: uvcvideo: Cleanup version-specific mapping media: uvcvideo: Remove PLF device quirking media: uvcvideo: Remove mappings form uvc_device_info drivers/media/usb/uvc/uvc_ctrl.c | 193 +++++++++++++++++++++---------------- drivers/media/usb/uvc/uvc_driver.c | 160 ++++++------------------------ drivers/media/usb/uvc/uvc_video.c | 169 ++++++++++++++++++++++---------- drivers/media/usb/uvc/uvcvideo.h | 10 +- 4 files changed, 261 insertions(+), 271 deletions(-)