From nobody Thu Apr 9 12:02:06 2026 Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (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 9C0D23D7D75 for ; Mon, 9 Mar 2026 15:02:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773068525; cv=none; b=d6CwugG7ZqCRpq3K8c4O1t8zAQOxMS+Ybb2uqFT4lsCvh+04r4nLLWXN2CmIzmjqGKg08IkHJTQmypZ9bhmNc8PH5x9aIiPEBCutDLEacndvSfBzhnYfqsRsf0oRzTvZAS1DFnnO0bX2HLcxiCcmTFDR81KRKvh6F/SOIiZj3Qo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773068525; c=relaxed/simple; bh=Mbnl3Jwma6KlozGox42tvgiZ/pjcufu4g8XidqPCjB4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Y6mwOWWumwUZYOpFx6HPMYmujml7Ohn6UbeppqmrIDJ+U7A40ctbyLGNZioTqMeX3uVr+Y7GBUukUbvF9uUbfIcf5Jy1h2eOHxvixJHSDn0ic3EgvjuzZfb2eIzYYWzR+rQ66XNbsXjBqCP1nVxeYSpDw2Emot6ZXkTer0SHzn0= 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=L1TKGnBr; arc=none smtp.client-ip=209.85.167.41 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="L1TKGnBr" Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-5a131870b72so4974628e87.1 for ; Mon, 09 Mar 2026 08:02:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1773068522; x=1773673322; 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=2Xis2x/y+lKGsadnAZDtI5Q0MzAKh0Sv2udI9oFCdCA=; b=L1TKGnBrwWKYVtv1l2Xq9Driew8ys+3lbs+BINcpmePlXQ+QGKgM0mFfOtWU25HHhl YoXgRc5l+72jraWmZsenSLN+HsJRhJoHFFwNs1zs+elNh9ffbRpl8bR+zaGO3S09QLRD tk58/qdZNs6GTVoGpMIJtnvQTmffqqF4TCfDY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773068522; x=1773673322; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=2Xis2x/y+lKGsadnAZDtI5Q0MzAKh0Sv2udI9oFCdCA=; b=bvjM+8AYyuKzd2tbShDkT1J08XAEq61NDunz+sBGIt7DIm26izXZT5Z+v5FSgGiyJa PCa/XjaA2L9rpheOdzHXIRinBogYkscuBSJF0i9Yu2Fxd/RVu3LHzaQ6aEIA1yhJPXNn C8mmONVxIYfLdGlNNWHDnRKJkLWEOOytzD/W5QW2d/Ozlwypl5W7nYrNUoM79eBAU0Te cvEPZtAV/kcv0qiIou+ELprzlRYC48WuL8W1GlHXTPZRnhsRxk1GBmSzAQFZue/GHjT6 gmo5EJWEqApaynJjFP/2EA3RFahagYOa941UOjH6uKuPMSSZ/H2QOH/YJnhGVnkkV61g w+zQ== X-Forwarded-Encrypted: i=1; AJvYcCXytSrplquwxBpeOKZER1WUD3WSGehPSRp+NLOsOpp3kjmUF5JjCaK3ziUqUzdX9SCj5v7hlKNSZON/8II=@vger.kernel.org X-Gm-Message-State: AOJu0YzFr3AbcldW0zA3koIBX4EeQFSF2thvox0LHzs/O7u1mm8aPP6x 0AYWMWowQYkz7+LaWHIIA4tiLVCrUncV2ATmzJG4bx6s5aOcc6cnu5cLjJVnGxTGNg== X-Gm-Gg: ATEYQzxgZvNDQ6Psiil4J67UNUBFyqZBoVNqNK9MmYVnSzyB5wzg+jtPJQMORRsxTqM wf53VQP1017DjynOgXA/cSJFq6N3WLDrpK52nAx7XRuqSt0k2UsQCEZfei2xAYGDs/u55isZJQX JZy3yly1RfZPhto7JnNvP0q6WJ6pNa6ZYGN3acRhGZdEjJQ9K1AqZmgBg+S5l9DVJgCp2gV/iii U0NUMpuq++5ATu8nM4gWPb3G8dAYqSb+sUZu/m9kEdiNFkcxpwPDczDocIaGX0w1KMz2deUG5XR y8s9SjBUJtkZhMwnHngG/ng1VsXEQlerVhmYdL20BCjHSvrkOgJeibtEQrV8DoDgXCDxgEhZb4v 6ItTqVPEPQ/4zUmUuSJa4Xg18puFe9zTfEhHfBrUi7MkKZ9cMBizygzODidadr1WX8UC5ZLfhIj DbMBVQwHpAyv99MENrxknSEb73Dlk3VaEB3B/0p2nDgqnjfHsTq1wdjK19GO8sPJQUxra1DJMnR jzwdGw7+Vfw X-Received: by 2002:a05:6512:3d0c:b0:5a1:3d83:5253 with SMTP id 2adb3069b0e04-5a13d83544cmr3752809e87.25.1773068520612; Mon, 09 Mar 2026 08:02:00 -0700 (PDT) Received: from ribalda.c.googlers.com (27.69.88.34.bc.googleusercontent.com. [34.88.69.27]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5a13d08cc0dsm2138003e87.80.2026.03.09.08.02.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 08:02:00 -0700 (PDT) From: Ricardo Ribalda Date: Mon, 09 Mar 2026 15:01:55 +0000 Subject: [PATCH 2/3] media: uvcvideo: uvc_queue_to_stream(): Support meta queues 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: <20260309-uvc-metadata-dmabuf-v1-2-fc8b87bd29c5@chromium.org> References: <20260309-uvc-metadata-dmabuf-v1-0-fc8b87bd29c5@chromium.org> In-Reply-To: <20260309-uvc-metadata-dmabuf-v1-0-fc8b87bd29c5@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Guennadi Liakhovetski Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Yunke Cao , Ricardo Ribalda X-Mailer: b4 0.14.3 The stream data structure has two queues: the metadata and the data queues, but uvc_queue_to_stream() only supports the data queue. If we pass the metadata queue the function will return an invalid pointer. This patch add a parameter to the function to explicitly tell the function which queue are we using. Signed-off-by: Ricardo Ribalda Reviewed-by: Hans de Goede --- drivers/media/usb/uvc/uvc_isight.c | 3 ++- drivers/media/usb/uvc/uvc_queue.c | 13 ++++++------- drivers/media/usb/uvc/uvcvideo.h | 4 +++- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_isight.c b/drivers/media/usb/uvc/uvc= _isight.c index 43cda5e760a3..ea9dc31dfbad 100644 --- a/drivers/media/usb/uvc/uvc_isight.c +++ b/drivers/media/usb/uvc/uvc_isight.c @@ -41,7 +41,8 @@ static int isight_decode(struct uvc_video_queue *queue, s= truct uvc_buffer *buf, 0xde, 0xad, 0xfa, 0xce }; =20 - struct uvc_streaming *stream =3D uvc_queue_to_stream(queue); + struct uvc_streaming *stream =3D uvc_queue_to_stream(queue, + V4L2_BUF_TYPE_VIDEO_CAPTURE); unsigned int maxlen, nbytes; u8 *mem; int is_header =3D 0; diff --git a/drivers/media/usb/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_= queue.c index 0eddd4f872ca..68ed2883edb2 100644 --- a/drivers/media/usb/uvc/uvc_queue.c +++ b/drivers/media/usb/uvc/uvc_queue.c @@ -78,7 +78,7 @@ static int uvc_queue_setup(struct vb2_queue *vq, unsigned int sizes[], struct device *alloc_devs[]) { struct uvc_video_queue *queue =3D vb2_get_drv_priv(vq); - struct uvc_streaming *stream; + struct uvc_streaming *stream =3D uvc_queue_to_stream(queue, vq->type); unsigned int size; =20 switch (vq->type) { @@ -87,7 +87,6 @@ static int uvc_queue_setup(struct vb2_queue *vq, break; =20 default: - stream =3D uvc_queue_to_stream(queue); size =3D stream->ctrl.dwMaxVideoFrameSize; break; } @@ -113,7 +112,7 @@ static int uvc_buffer_prepare(struct vb2_buffer *vb) =20 if (vb->type =3D=3D V4L2_BUF_TYPE_VIDEO_OUTPUT && vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0)) { - uvc_dbg(uvc_queue_to_stream(queue)->dev, CAPTURE, + uvc_dbg(uvc_queue_to_stream(queue, vb->type)->dev, CAPTURE, "[E] Bytes used out of bounds\n"); return -EINVAL; } @@ -160,7 +159,7 @@ static void uvc_buffer_finish(struct vb2_buffer *vb) { struct vb2_v4l2_buffer *vbuf =3D to_vb2_v4l2_buffer(vb); struct uvc_video_queue *queue =3D vb2_get_drv_priv(vb->vb2_queue); - struct uvc_streaming *stream =3D uvc_queue_to_stream(queue); + struct uvc_streaming *stream =3D uvc_queue_to_stream(queue, vb->type); struct uvc_buffer *buf =3D uvc_vbuf_to_buffer(vbuf); =20 if (vb->state =3D=3D VB2_BUF_STATE_DONE) @@ -170,7 +169,7 @@ static void uvc_buffer_finish(struct vb2_buffer *vb) 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); + struct uvc_streaming *stream =3D uvc_queue_to_stream(queue, vq->type); int ret; =20 lockdep_assert_irqs_enabled(); @@ -197,11 +196,11 @@ static int uvc_start_streaming_video(struct vb2_queue= *vq, unsigned int count) static void uvc_stop_streaming_video(struct vb2_queue *vq) { struct uvc_video_queue *queue =3D vb2_get_drv_priv(vq); - struct uvc_streaming *stream =3D uvc_queue_to_stream(queue); + struct uvc_streaming *stream =3D uvc_queue_to_stream(queue, vq->type); =20 lockdep_assert_irqs_enabled(); =20 - uvc_video_stop_streaming(uvc_queue_to_stream(queue)); + uvc_video_stop_streaming(stream); =20 uvc_pm_put(stream->dev); =20 diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvi= deo.h index 8480d65ecb85..9b4849fda12f 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -703,8 +703,10 @@ static inline int uvc_queue_streaming(struct uvc_video= _queue *queue) } =20 static inline struct uvc_streaming * -uvc_queue_to_stream(struct uvc_video_queue *queue) +uvc_queue_to_stream(struct uvc_video_queue *queue, unsigned int type) { + if (type =3D=3D V4L2_BUF_TYPE_META_CAPTURE) + return container_of(queue, struct uvc_streaming, meta.queue); return container_of(queue, struct uvc_streaming, queue); } =20 --=20 2.53.0.473.g4a7958ca14-goog