From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 29A272522B6; Mon, 30 Jun 2025 13:25:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751289907; cv=none; b=piFdGl73tV8aMt75K8/LNFVVv4D0F/wBWMMKzl3w2upHtPLAp3/KAnq2S3tvhumUxekIty1eU28ImpnLgYuNydBB++jzNuei8y6VgHEma548ybA8yy/zq+RbrWQOOv81XU5jSuNvH9f3V1ew33YEJ3CHcnGrE3W3wokWPtidYms= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751289907; c=relaxed/simple; bh=39GspmHXfLO8iqlwrFTn7btp/d+2V7xPthkkOs9xCXI=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=Uw2C35+fFVwAbT9l5Eg3qgihrsmq5t2hR3bYKgNen/IkQK6Mvk6cnh6vpu6wzuoPr0Mlj0V8fYNwWYqY4ITd7xamdF1itsp5pA/boAUtxvWLr37eXZ6c0awfjepmQY9m/81UTWVpB4jHSritOPX0OusgeLD1mopEQAj/7bWTZJo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=rTqzn3tE; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="rTqzn3tE" Received: from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi [81.175.209.231]) by perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id AC497928; Mon, 30 Jun 2025 15:24:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1751289882; bh=39GspmHXfLO8iqlwrFTn7btp/d+2V7xPthkkOs9xCXI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=rTqzn3tEXJ66vbughkyAN8Hm8niv3uyiCE1PHOAz0qbloCLBLB2JnaDJ1ya9gx2yf Zu/3U/pr7E2z23T9SHpH7yeZ23n1kxiOhjIyKqoO2tg9QF0uD/E0XeIzxLySigB1Ii DgOXG7qul7KR6ICVXB7QzeP21/WgT5pEGy4dU3kY= Date: Mon, 30 Jun 2025 16:24:38 +0300 From: Laurent Pinchart To: Hans de Goede Cc: Hans Verkuil , Ricardo Ribalda , Hans de Goede , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v4 3/5] media: uvcvideo: Split uvc_stop_streaming() Message-ID: <20250630132438.GC23516@pendragon.ideasonboard.com> References: <20250616-uvc-fop-v4-0-250286570ee7@chromium.org> <20250616-uvc-fop-v4-3-250286570ee7@chromium.org> <04e10cfa-f1b1-4327-b0ca-c66f8450d42f@xs4all.nl> <20250630131004.GF20333@pendragon.ideasonboard.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: On Mon, Jun 30, 2025 at 03:12:38PM +0200, Hans de Goede wrote: > On 30-Jun-25 3:10 PM, Laurent Pinchart wrote: > > On Mon, Jun 30, 2025 at 02:59:05PM +0200, Hans de Goede wrote: > >> On 17-Jun-25 11:27 AM, Hans Verkuil wrote: > >>> On 16/06/2025 17:24, Ricardo Ribalda wrote: > >>>> uvc_stop_streaming() is used for meta and video nodes. Split the function > >>>> in two to avoid confusion. > >>>> > >>>> Use this opportunity to rename uvc_start_streaming() to > >>>> uvc_start_streaming_video(), as it is only called by the video nodes. > >>>> > >>>> Reviewed-by: Hans de Goede > >>>> Signed-off-by: Ricardo Ribalda > >>>> --- > >>>> drivers/media/usb/uvc/uvc_queue.c | 22 +++++++++++++++------- > >>>> 1 file changed, 15 insertions(+), 7 deletions(-) > >>>> > >>>> diff --git a/drivers/media/usb/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_queue.c > >>>> index 8f9737ac729546683ca48f5e71ce3dfacbae2926..3f357c2d48cfd258c26f0342007d1d12f1e01007 100644 > >>>> --- a/drivers/media/usb/uvc/uvc_queue.c > >>>> +++ b/drivers/media/usb/uvc/uvc_queue.c > >>>> @@ -167,7 +167,7 @@ static void uvc_buffer_finish(struct vb2_buffer *vb) > >>>> uvc_video_clock_update(stream, vbuf, buf); > >>>> } > >>>> > >>>> -static int uvc_start_streaming(struct vb2_queue *vq, unsigned int count) > >>>> +static int uvc_start_streaming_video(struct vb2_queue *vq, unsigned int count) > >>>> { > >>>> struct uvc_video_queue *queue = vb2_get_drv_priv(vq); > >>>> struct uvc_streaming *stream = uvc_queue_to_stream(queue); > >>>> @@ -186,14 +186,22 @@ static int uvc_start_streaming(struct vb2_queue *vq, unsigned int count) > >>>> return ret; > >>>> } > >>>> > >>>> -static void uvc_stop_streaming(struct vb2_queue *vq) > >>>> +static void uvc_stop_streaming_video(struct vb2_queue *vq) > >>>> { > >>>> struct uvc_video_queue *queue = vb2_get_drv_priv(vq); > >>>> > >>>> lockdep_assert_irqs_enabled(); > >>>> > >>>> - if (vq->type != V4L2_BUF_TYPE_META_CAPTURE) > >>>> - uvc_video_stop_streaming(uvc_queue_to_stream(queue)); > >>>> + uvc_video_stop_streaming(uvc_queue_to_stream(queue)); > >>>> + > >>>> + uvc_queue_return_buffers(queue, UVC_BUF_STATE_ERROR); > >>>> +} > >>>> + > >>>> +static void uvc_stop_streaming_meta(struct vb2_queue *vq) > >>>> +{ > >>>> + struct uvc_video_queue *queue = vb2_get_drv_priv(vq); > >>>> + > >>>> + lockdep_assert_irqs_enabled(); > >>>> > >>>> uvc_queue_return_buffers(queue, UVC_BUF_STATE_ERROR); > >>>> } > >>>> @@ -203,15 +211,15 @@ static const struct vb2_ops uvc_queue_qops = { > >>>> .buf_prepare = uvc_buffer_prepare, > >>>> .buf_queue = uvc_buffer_queue, > >>>> .buf_finish = uvc_buffer_finish, > >>>> - .start_streaming = uvc_start_streaming, > >>>> - .stop_streaming = uvc_stop_streaming, > >>>> + .start_streaming = uvc_start_streaming_video, > >>>> + .stop_streaming = uvc_stop_streaming_video, > >>>> }; > >>>> > >>>> static const struct vb2_ops uvc_meta_queue_qops = { > >>>> .queue_setup = uvc_queue_setup, > >>>> .buf_prepare = uvc_buffer_prepare, > >>>> .buf_queue = uvc_buffer_queue, > >>>> - .stop_streaming = uvc_stop_streaming, > >>>> + .stop_streaming = uvc_stop_streaming_meta, > >>>> }; > >>> > >>> I think there should be a comment stating that the metadata stream > >>> expects that video is streaming, it does not start streaming by itself. > >>> > >>> Something like: > >>> > >>> /* > >>> * .start_streaming is not provided here. Metadata relies on > >>> * video streaming being active. If video isn't streaming, then > >>> * no metadata will arrive either. > >>> */ > >>> > >>> It's unexpected that there is no start_streaming for metadata, so a > >>> comment wouldn't hurt. > >> > >> I've added this comment while merging this series and I've now pushed > >> the entire series to uvc.git/for-next . > >> > >> BTW it seems that both uvc.git/next and uvc.git/for-next are in > >> use now? With uvc.git/next seemingly following media-commiters/next ? > > > > As far as I understand, some jobs in the media CI use the next branch, > > for instance the bisect job that tries to compile every commit uses the > > next branch as a base. We therefore need to keep the next branch > > up-to-date, mirroring upstream. > > Ok, so we have the next branch mirroring upstream and then we > use for-next to merge new patches as I've just done ? Sounds good. -- Regards, Laurent Pinchart