Hi Laurent! > Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> THX! Don't forget the "Acked-by: Arnd Bergmann <arnd@xxxxxxxx>" (see Patchwork: https://patchwork.linuxtv.org/patch/46464 ). > and taken into my tree for v4.17. When will this merged to the media-tree trunk? In another month or earlier? This issue was overlooked when merging the change from Arnd in the first place. This broke the Kernel build for older Kernels more than two months ago! I fixed that in my holidays expecting this gets merged soon and now the build is still broken because of this problem. In the past Mauro merged those simple fixes soon and now it seems nobody cares about building for older Kernels (it's broken for more than two months now!). I mostly try to fix such issues in a short time frame (even on vacation), but then it gets lost ... . Sorry, but this is frustrating! We don't talk about a nice to have fix but a essential fix to get the media build system working again. Such patches need to get merged as early as possible in my opinion, especially when someone else sent already an "Acked-by" (THX to Arnd). I could have made this as a patch in the Build system also, but this would be the wrong place, but then Hans would have merged it already and I could look into the other build problems. BR, Jasmin ************************************************************************* On 02/02/2018 12:32 PM, Laurent Pinchart wrote: > Hi Jasmin, > > Thank you for the patch. > > On Sunday, 14 January 2018 12:21:43 EET Jasmin J. wrote: >> From: Jasmin Jessich <jasmin@xxxxxx> >> >> Commit 828ee8c71950 ("media: uvcvideo: Use ktime_t for timestamps") >> changed to use ktime_t for timestamps. Older Kernels use a struct for >> ktime_t, which requires the conversion function ktime_to_ns to be used on >> some places. With this patch it will compile now also for older Kernel >> versions. >> >> Signed-off-by: Jasmin Jessich <jasmin@xxxxxx> > > Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> > > and taken into my tree for v4.17. > >> --- >> drivers/media/usb/uvc/uvc_video.c | 5 +++-- >> 1 file changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/media/usb/uvc/uvc_video.c >> b/drivers/media/usb/uvc/uvc_video.c index 5441553..1670aeb 100644 >> --- a/drivers/media/usb/uvc/uvc_video.c >> +++ b/drivers/media/usb/uvc/uvc_video.c >> @@ -1009,7 +1009,7 @@ static int uvc_video_decode_start(struct uvc_streaming >> *stream, >> >> buf->buf.field = V4L2_FIELD_NONE; >> buf->buf.sequence = stream->sequence; >> - buf->buf.vb2_buf.timestamp = uvc_video_get_time(); >> + buf->buf.vb2_buf.timestamp = ktime_to_ns(uvc_video_get_time()); >> >> /* TODO: Handle PTS and SCR. */ >> buf->state = UVC_BUF_STATE_ACTIVE; >> @@ -1191,7 +1191,8 @@ static void uvc_video_decode_meta(struct uvc_streaming >> *stream, >> >> uvc_trace(UVC_TRACE_FRAME, >> "%s(): t-sys %lluns, SOF %u, len %u, flags 0x%x, PTS %u, STC %u frame >> SOF %u\n", - __func__, time, meta->sof, meta->length, meta->flags, >> + __func__, ktime_to_ns(time), meta->sof, meta->length, >> + meta->flags, >> has_pts ? *(u32 *)meta->buf : 0, >> has_scr ? *(u32 *)scr : 0, >> has_scr ? *(u32 *)(scr + 4) & 0x7ff : 0); > >
