From patchwork Tue Oct 27 21:24:44 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 28649 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 97869C324C for ; Tue, 27 Oct 2026 21:24:56 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C1CD46905B; Tue, 27 Oct 2026 22:24:53 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="T5sXeaUH"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id A14A069053 for ; Tue, 27 Oct 2026 22:24:50 +0100 (CET) Received: from killaraus.ideasonboard.com (2001-14ba-70f3-e800--a06.rev.dnainternet.fi [IPv6:2001:14ba:70f3:e800::a06]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 603A94BB for ; Tue, 27 Oct 2026 22:22:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1793136158; bh=1htp5OeHPFLOiCyoKncYHYUvikbM9ozj21gD+kYKhb4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=T5sXeaUHuNo0jdLh2jmV6eBx7vx2dIVsnIYxcrMBFtN6ocPjQ/uScBDhEElhjzECJ cHTWN/QAC+bFco8AoHywGEwsvauuCjkbTTM1XmpX5aIoh4c3jNRy0NC3/72SbSX3Jw OpI6b2czZxWRbM2VX14GAu5e8kUi/DXcApk/OKgc= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Subject: [PATCH 1/4] v4l2: v4l2_camera_proxy: Clear PREPARED flag when queuing buffer Date: Tue, 27 Oct 2026 23:24:44 +0200 Message-ID: <20261027212447.2551591-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261027212447.2551591-1-laurent.pinchart@ideasonboard.com> References: <20261027212447.2551591-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" When a buffer is queued with VIDIOC_QBUF, the V4L2 API clears the V4L2_BUF_FLAG_PREPARED flag and set V4L2_BUF_FLAG_QUEUED. The v4l2-compat layer instead sets boths flags, which is reported as an error by v4l2-compliance: Streaming ioctls: test read/write: OK (Not Supported) fail: v4l2-test-buffers.cpp(381): buf_states > 1 fail: v4l2-test-buffers.cpp(1548): buf.check(q, Queued, i) fail: v4l2-test-buffers.cpp(1708): setupMmap(node, q) test MMAP (no poll, REQBUFS): FAIL Fix it by clearing the V4L2_BUF_FLAG_PREPARED flag. There is then no need to clear the flag in vidioc_dqbuf() any more. Fixes: 7278a59eba64 ("v4l2: v4l2_camera_proxy: Dispatch VIDIOC_PREPARE_BUF") Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi Reviewed-by: Kieran Bingham --- src/v4l2/v4l2_camera_proxy.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp index 210c8e875528..ca1115d017ac 100644 --- a/src/v4l2/v4l2_camera_proxy.cpp +++ b/src/v4l2/v4l2_camera_proxy.cpp @@ -649,8 +649,8 @@ int V4L2CameraProxy::vidioc_qbuf(V4L2CameraFile *file, struct v4l2_buffer *arg) if (ret < 0) return ret; - buffers_[arg->index].flags |= V4L2_BUF_FLAG_QUEUED | - V4L2_BUF_FLAG_PREPARED; + buffers_[arg->index].flags &= ~V4L2_BUF_FLAG_PREPARED; + buffers_[arg->index].flags |= V4L2_BUF_FLAG_QUEUED; arg->flags = buffers_[arg->index].flags; @@ -694,7 +694,7 @@ int V4L2CameraProxy::vidioc_dqbuf(V4L2CameraFile *file, struct v4l2_buffer *arg, struct v4l2_buffer &buf = buffers_[currentBuf_]; - buf.flags &= ~(V4L2_BUF_FLAG_QUEUED | V4L2_BUF_FLAG_DONE | V4L2_BUF_FLAG_PREPARED); + buf.flags &= ~(V4L2_BUF_FLAG_QUEUED | V4L2_BUF_FLAG_DONE); buf.length = sizeimage_; *arg = buf; From patchwork Tue Oct 27 21:24:45 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 28650 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 2DDD7C324C for ; Tue, 27 Oct 2026 21:24:58 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 35F8369066; Tue, 27 Oct 2026 22:24:55 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="RH2tHrdf"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 402AD6905E for ; Tue, 27 Oct 2026 22:24:52 +0100 (CET) Received: from killaraus.ideasonboard.com (2001-14ba-70f3-e800--a06.rev.dnainternet.fi [IPv6:2001:14ba:70f3:e800::a06]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 9BC334BB for ; Tue, 27 Oct 2026 22:22:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1793136159; bh=Rl2/qcRDRcfKDw75tZ8MigW4sJL7R4vzJ5k3uTyay+0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=RH2tHrdfKq5WwTJeGokrntDls+O3OJ2/n6YP6FTBz+lae4RUfUiHwFSP51ZB0+rQ6 Ih3zwUEXKdlXGWC/ph+xfHr6FWEDXjPqho7nkapE3IbT0z1Yr67BmZpmZ7GaM4Ijsu wagHmoMI4LYGD/jtx7rHguvcI18Lwmrq3tdf4u6s= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Subject: [PATCH 2/4] v4l2: v4l2_camera_proxy: Set buffer field unconditionally Date: Tue, 27 Oct 2026 23:24:45 +0200 Message-ID: <20261027212447.2551591-3-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261027212447.2551591-1-laurent.pinchart@ideasonboard.com> References: <20261027212447.2551591-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" When handling a buffer with the V4L2_BUF_FLAG_ERROR flag set, the v4l2-compat layer doesn't set any if the v4l2_buffer fields except for the flag. This leaves the value of v4l2_buffer::field unmodified, and equal to V4L2_FIELD_ANY (0) if the error occurs the first time the buffer is dequeued. v4l2-compliance then reports a failure: Streaming ioctls: test read/write: OK (Not Supported) fail: v4l2-test-buffers.cpp(423): g_field() == V4L2_FIELD_ANY fail: v4l2-test-buffers.cpp(1293): buf.check(q, last_seq) fail: v4l2-test-buffers.cpp(1748): captureBufs(node, node_m2m_cap, q, m2m_q, frame_count, pollmode, capture_count) test MMAP (no poll, REQBUFS): FAIL As the v4l2-compat layer doesn't support interlacing, fix this by unconditionally setting v4l2_buffer::field to V4L2_FIELD_NONE when allocating buffers. While at it, sort the member assignments in the same order as in the structure definition. Closes: https://gitlab.freedesktop.org/camera/libcamera/-/work_items/369 Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi Reviewed-by: Kieran Bingham --- src/v4l2/v4l2_camera_proxy.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp index ca1115d017ac..2786e29e1ed7 100644 --- a/src/v4l2/v4l2_camera_proxy.cpp +++ b/src/v4l2/v4l2_camera_proxy.cpp @@ -255,7 +255,6 @@ void V4L2CameraProxy::updateBuffers() [](unsigned int total, const auto &plane) { return total + plane.bytesused; }); - buf.field = V4L2_FIELD_NONE; buf.timestamp.tv_sec = fmd.timestamp / 1000000000; buf.timestamp.tv_usec = (fmd.timestamp / 1000) % 1000000; buf.sequence = fmd.sequence; @@ -557,12 +556,13 @@ int V4L2CameraProxy::vidioc_reqbufs(V4L2CameraFile *file, struct v4l2_requestbuf buffers_.resize(arg->count); for (unsigned int i = 0; i < arg->count; i++) { struct v4l2_buffer buf = {}; + buf.index = i; buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - buf.length = v4l2PixFormat_.sizeimage; + buf.flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; + buf.field = V4L2_FIELD_NONE; buf.memory = V4L2_MEMORY_MMAP; buf.m.offset = i * v4l2PixFormat_.sizeimage; - buf.index = i; - buf.flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; + buf.length = v4l2PixFormat_.sizeimage; buffers_[i] = buf; } From patchwork Tue Oct 27 21:24:46 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 28651 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 09079C3302 for ; Tue, 27 Oct 2026 21:24:59 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3A8BC69069; Tue, 27 Oct 2026 22:24:57 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="MWDLCXeh"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3008569059 for ; Tue, 27 Oct 2026 22:24:53 +0100 (CET) Received: from killaraus.ideasonboard.com (2001-14ba-70f3-e800--a06.rev.dnainternet.fi [IPv6:2001:14ba:70f3:e800::a06]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id D45FD4BB for ; Tue, 27 Oct 2026 22:22:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1793136161; bh=znBtFpnTIvh28TAIbShinuerBWcwv1okipom30ndFnY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=MWDLCXehLo6DJNe3S1EKKXhWzOvIvEdaLV0ekvfVVboC0e0Ip6figyK3ZnSgsAR3r lD6dSQOaRGOfuM1wI/nkL0X7sVTY993l5cCFNImcvij2Tj/F1v7UZ5FdeAv3DL97O5 d4lrB5+KfItXSebaC/OCV4C8WAZA12KQmXwrQdCg= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Subject: [PATCH 3/4] v4l2: v4l2_camera_proxy: Clear ERROR flag when dequeuing or stopping streaming Date: Tue, 27 Oct 2026 23:24:46 +0200 Message-ID: <20261027212447.2551591-4-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261027212447.2551591-1-laurent.pinchart@ideasonboard.com> References: <20261027212447.2551591-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" When a buffer is dequeued with VIDIOC_DQBUF, the V4L2 API reports buffer erros with the V4L2_BUF_FLAG_ERROR. The API documentation doesn't state what flags a subsequent VIDIOC_QUERYBUF call should return for the same buffer, but videobuf2 sets the buffer state to dequeued just before returning from VIDIOC_DQBUF, effectively clearing V4L2_BUF_FLAG_ERROR. Similarly, a call to VIDIOC_STREAMOFF also put all queued buffers back in the dequeued state. Implement the same behaviour and clear the flag in vidioc_dqbuf() and vidioc_streamoff(). This issue isn't caught by v4l2-compliance. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi Reviewed-by: Kieran Bingham --- src/v4l2/v4l2_camera_proxy.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp index 2786e29e1ed7..03b8a4210046 100644 --- a/src/v4l2/v4l2_camera_proxy.cpp +++ b/src/v4l2/v4l2_camera_proxy.cpp @@ -698,6 +698,8 @@ int V4L2CameraProxy::vidioc_dqbuf(V4L2CameraFile *file, struct v4l2_buffer *arg, buf.length = sizeimage_; *arg = buf; + buf.flags &= ~V4L2_BUF_FLAG_ERROR; + currentBuf_ = (currentBuf_ + 1) % bufferCount_; uint64_t data; @@ -778,7 +780,7 @@ int V4L2CameraProxy::vidioc_streamoff(V4L2CameraFile *file, int *arg) for (struct v4l2_buffer &buf : buffers_) buf.flags &= ~(V4L2_BUF_FLAG_QUEUED | V4L2_BUF_FLAG_DONE | - V4L2_BUF_FLAG_PREPARED); + V4L2_BUF_FLAG_ERROR | V4L2_BUF_FLAG_PREPARED); return ret; } From patchwork Tue Oct 27 21:24:47 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 28652 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 6590DC324C for ; Tue, 27 Oct 2026 21:25:00 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 11E856906A; Tue, 27 Oct 2026 22:25:00 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="BH0eL7mu"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7DF9B69053 for ; Tue, 27 Oct 2026 22:24:54 +0100 (CET) Received: from killaraus.ideasonboard.com (2001-14ba-70f3-e800--a06.rev.dnainternet.fi [IPv6:2001:14ba:70f3:e800::a06]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 34071929 for ; Tue, 27 Oct 2026 22:22:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1793136162; bh=9ULFZRBDcd1HeKHtnSx1h+KdX/4QAAYMU3w5N/0zAFA=; h=From:To:Subject:Date:In-Reply-To:References:From; b=BH0eL7mumxLpMU9K/IHq01z0X1Slkw8jqBXrWEFptqFaZcc04fjvuAiouI4GKn7/N W+wnndvVLxfLZroKFKMmCHqN5z8fhs0p7dSffoqs7Xdwm+yfi/VDEWajUias8/l1DN Fi/UGdPSOHpAfry55qqUxvZ+aD0F5PKyFepGK69Q= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Subject: [PATCH 4/4] v4l2: v4l2_camera_proxy: Set DONE flag on error buffers Date: Tue, 27 Oct 2026 23:24:47 +0200 Message-ID: <20261027212447.2551591-5-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261027212447.2551591-1-laurent.pinchart@ideasonboard.com> References: <20261027212447.2551591-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" A buffer that has completed with an error is considered by the V4L2 API as done. videobuf2 sets both V4L2_BUF_FLAG_DONE and V4L2_BUF_FLAG_ERROR flags in that case. Copy that behaviour in v4l2-compat. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi Reviewed-by: Kieran Bingham --- src/v4l2/v4l2_camera_proxy.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp index 03b8a4210046..28dfb2c4b63c 100644 --- a/src/v4l2/v4l2_camera_proxy.cpp +++ b/src/v4l2/v4l2_camera_proxy.cpp @@ -262,7 +262,7 @@ void V4L2CameraProxy::updateBuffers() buf.flags |= V4L2_BUF_FLAG_DONE; break; case FrameMetadata::FrameError: - buf.flags |= V4L2_BUF_FLAG_ERROR; + buf.flags |= V4L2_BUF_FLAG_DONE | V4L2_BUF_FLAG_ERROR; break; default: break;