[git:v4l-utils/stable-1.30] v4l2-compliance: run testBlockingWait when streaming

[Gregor Jasny]

This is an automatic generated email to let you know that the following patch 
were queued at the 
http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:

Subject: v4l2-compliance: run testBlockingWait when streaming
Author:  Hans Verkuil <hverk...@xs4all.nl>
Date:    Thu May 1 13:44:17 2025 +0200

This fixes the previous commit which would skip the test for all
media-centric devices. Instead, only skip for media-centric devices
when not streaming.

Fixes: 60e0120f0ef5 ("v4l2-compliance: Don't perform blocking DQBUF test on 
MC_IO devices")
Signed-off-by: Hans Verkuil <hverk...@xs4all.nl>
(cherry picked from commit dc51d9daa9ff994bc8fc33ab88a331f5303a15f2)
Signed-off-by: Gregor Jasny <gja...@googlemail.com>

 utils/v4l2-compliance/v4l2-compliance.cpp   | 4 +++-
 utils/v4l2-compliance/v4l2-test-buffers.cpp | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

---

http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=0faa55feb676594c678bc543a0e29f810bbf6db3
diff --git a/utils/v4l2-compliance/v4l2-compliance.cpp 
b/utils/v4l2-compliance/v4l2-compliance.cpp
index 108130c1d1d3..a0a881fdb44f 100644
--- a/utils/v4l2-compliance/v4l2-compliance.cpp
+++ b/utils/v4l2-compliance/v4l2-compliance.cpp
@@ -1495,7 +1495,9 @@ void testNode(struct node &node, struct node 
&node_m2m_cap, struct node &expbuf_
                printf("\ttest Requests: %s\n", ok(testRequests(&node, 
options[OptStreaming])));
                if (sizeof(void *) == 4)
                        printf("\ttest TIME32/64: %s\n", 
ok(testTime32_64(&node)));
-               printf("\ttest blocking wait: %s\n", 
ok(testBlockingWait(&node)));
+               // If this is a media-centric device, then only run when 
streaming
+               if (!node.is_io_mc || options[OptStreaming])
+                       printf("\ttest blocking wait: %s\n", 
ok(testBlockingWait(&node)));
 
                // Reopen after each streaming test to reset the streaming state
                // in case of any errors in the preceeding test.
diff --git a/utils/v4l2-compliance/v4l2-test-buffers.cpp 
b/utils/v4l2-compliance/v4l2-test-buffers.cpp
index 30f2b5d17c4f..572973b2b755 100644
--- a/utils/v4l2-compliance/v4l2-test-buffers.cpp
+++ b/utils/v4l2-compliance/v4l2-test-buffers.cpp
@@ -3119,7 +3119,7 @@ int testBlockingWait(struct node *node)
        bool can_stream = node->g_caps() & V4L2_CAP_STREAMING;
        int type;
 
-       if (!can_stream || node->is_io_mc || !node->valid_buftypes)
+       if (!can_stream || !node->valid_buftypes)
                return ENOTTY;
 
        buffer_info.clear();