From nobody Wed Oct 8 09:02:16 2025 Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 690EC2AE68 for ; Tue, 1 Jul 2025 06:45:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751352329; cv=none; b=Q5xPXq/bstJ2YJaAqzHm8zzYWuMwAGOE2e6Ud7XxHcJ6rF2UAPYwAkYuZBxg2jlKIP3pzkKjOqyqTp1HxUNa2V30fOM8F9HxwgCV1JfjFtbPJmON5DC/7pGDtup/lR/QfUwPvwI5L5VYprzjn04NJFcxlwqz43YMKQ/FFt7aYx8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751352329; c=relaxed/simple; bh=jhmtrOZynF97yPTl8KLNDy4e5vqCIcVcQhtc4QKka7E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HkFKFDhwSwPcBwSNlv2tBiAd+J7NpR8sxIa4IuC9EIdsQhNXrBr/iHBia24d5zAMXU0F0f8JXbNQYsp1Im4z4tia8ZEDQ/gu0Y1PBbfOcqQThTai/ZYUiAUDahwR43M9oXRHaTtd9B2JrdEf89m0FOxqM2b67UVBpgQ5F7xHTKE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=Vm5mIpfV; arc=none smtp.client-ip=209.85.167.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Vm5mIpfV" Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-5535652f42cso6298640e87.2 for ; Mon, 30 Jun 2025 23:45:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1751352325; x=1751957125; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=2sXxnutuQNshAuN25MG1B9YNe5116VtrTWttVb+J9U0=; b=Vm5mIpfVaz3rUdhYcQQRP92XWGAmyxL2SrEQWE15C/sj2HAgFX5bPZLiBb2WTL0X3R j4COTNY9FodlmoMyKPYGjdvXj1p429hmAt7W5PRIV15t8okmwxRPhxETo/lDLBYNPjkE k5pZ9qpNn/7kjDBRaPzxS9zGgQdc3bWBbXUm4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751352325; x=1751957125; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2sXxnutuQNshAuN25MG1B9YNe5116VtrTWttVb+J9U0=; b=wWwnOCoqD8iQE6Ng9d1Fm+j3yMqxdTQUGpESdCtahhXh98wjCvHdhUdfWfZbkKcdlX r3NVS0tjW8k/UzA1+b2YUKx6V6Qc1q08FkIXVLglRIttH/Lf/VLSVDESpcAPiA5jGxqA +dc8RCQnlt87RYw3+QPs7Fn+zkns3w1Br9wYFDxMXY8qyqUvua0LyMlSmKbSguoAVccI jPFZTaXxb4OrLmZOxdbf73ZS/DWUWU3+RcBYJOWDMuZg98JIMcQB2gmL1AC4NItnhpeM DoCko+QMq0pGcP54xZx7OfxiHaZ1ajh9xEx6XmiVm8T199WyWo91RSUXSG4deHX58MjE 3U0Q== X-Forwarded-Encrypted: i=1; AJvYcCUwFH4bjpwKG8YtCglD/mo+61W7a25cVTT7qwlxN3KZ9/w1AjAD68EFBYsMfH/ZiXQKwaKC816WW4iK31E=@vger.kernel.org X-Gm-Message-State: AOJu0Yx15j6B9HibvTsA8cCoFEHVlv7ulLVsrQeaU3IpF/0X7oNnYBkA oCTS1Dmq+/2oT28/+N10qRkSlwXYur2ntbh1Q0eSUxiazTOfIj40FYLJvA3io8F6RA== X-Gm-Gg: ASbGncuJ78ioF73r5tG+TxaOyi4uxblkvKZPlkkboxdB8CWQS+XLToVQAyOrvYOP8qB W3ZvOkYWwca1vJ+zgKUh8ggQGqGomA/6r1PRoH+Gwptgtdjw2DklqBOBOR3HECkvoclVBEOP912 zysnwcPB5qKNCrogsY8KHK6pNcHgkTXcofh0q+ZNYmS78uxwCo8w2PVJIFvi8o8vdlp3ozpC9Kc Mr8vXkFCZy8CAES7ujubLLsdcLPGnfH0FhgQw3B+IMwSj+AHqWVInHXgygLuivpOJ4ffspCUfZZ Oyw4BMkpQapn43lo7lwlsZ8DvzbcuIT8vrSHjksIkOixQtQORjNAt1AJl+CYXYyRlb9I2H1tEtv j3d7z2lM5zwS/Ek6xVn+eV/PUw8tbDz4T2jqUZ+tZW8knVmLQ0MQ6 X-Google-Smtp-Source: AGHT+IF1etfyT7/NUGPtPe6d6TgQJ1iZ8CgDGWZOhy283zZxe+7Pl5YxqqWScvwVSr2a+sYL6DYvnA== X-Received: by 2002:a05:6512:ba1:b0:553:2869:3a5 with SMTP id 2adb3069b0e04-5550b8d00f2mr4123019e87.48.1751352325396; Mon, 30 Jun 2025 23:45:25 -0700 (PDT) Received: from ribalda.c.googlers.com (166.141.88.34.bc.googleusercontent.com. [34.88.141.166]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5550b2f162dsm1704836e87.248.2025.06.30.23.45.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jun 2025 23:45:25 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 01 Jul 2025 06:45:15 +0000 Subject: [PATCH v4 3/7] media: uvcvideo: Split uvc_stop_streaming() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250701-uvc-grannular-invert-v4-3-8003b9b89f68@chromium.org> References: <20250701-uvc-grannular-invert-v4-0-8003b9b89f68@chromium.org> In-Reply-To: <20250701-uvc-grannular-invert-v4-0-8003b9b89f68@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab , Hans Verkuil , Hans de Goede , Hans de Goede Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.14.2 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 Link: https://lore.kernel.org/r/20250616-uvc-fop-v4-3-250286570ee7@chromium= .org Reviewed-by: Hans Verkuil Signed-off-by: Hans de Goede --- drivers/media/usb/uvc/uvc_queue.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_= queue.c index 8f9737ac729546683ca48f5e71ce3dfacbae2926..b11f56d62ec0495a86105803674= 86dfaa31c450d 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); } =20 -static int uvc_start_streaming(struct vb2_queue *vq, unsigned int count) +static int uvc_start_streaming_video(struct vb2_queue *vq, unsigned int co= unt) { struct uvc_video_queue *queue =3D vb2_get_drv_priv(vq); struct uvc_streaming *stream =3D uvc_queue_to_stream(queue); @@ -186,14 +186,22 @@ static int uvc_start_streaming(struct vb2_queue *vq, = unsigned int count) return ret; } =20 -static void uvc_stop_streaming(struct vb2_queue *vq) +static void uvc_stop_streaming_video(struct vb2_queue *vq) { struct uvc_video_queue *queue =3D vb2_get_drv_priv(vq); =20 lockdep_assert_irqs_enabled(); =20 - if (vq->type !=3D 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 =3D vb2_get_drv_priv(vq); + + lockdep_assert_irqs_enabled(); =20 uvc_queue_return_buffers(queue, UVC_BUF_STATE_ERROR); } @@ -203,15 +211,20 @@ static const struct vb2_ops uvc_queue_qops =3D { .buf_prepare =3D uvc_buffer_prepare, .buf_queue =3D uvc_buffer_queue, .buf_finish =3D uvc_buffer_finish, - .start_streaming =3D uvc_start_streaming, - .stop_streaming =3D uvc_stop_streaming, + .start_streaming =3D uvc_start_streaming_video, + .stop_streaming =3D uvc_stop_streaming_video, }; =20 static const struct vb2_ops uvc_meta_queue_qops =3D { .queue_setup =3D uvc_queue_setup, .buf_prepare =3D uvc_buffer_prepare, .buf_queue =3D uvc_buffer_queue, - .stop_streaming =3D uvc_stop_streaming, + /* + * .start_streaming is not provided here. Metadata relies on video + * streaming being active. If video isn't streaming, then no metadata + * will arrive either. + */ + .stop_streaming =3D uvc_stop_streaming_meta, }; =20 int uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type) --=20 2.50.0.727.gbf7dc18ff4-goog