Reduce v4l messages report level

Don't override videobuf2 modules prior to kernel 5 (cherry picked from commit 4ec8f88)
IntelRealSense · Dec 15, 2020 · c6a8d2b · c6a8d2b
1 parent 4fedb62
commit c6a8d2b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/scripts/patch-realsense-ubuntu-lts.sh b/scripts/patch-realsense-ubuntu-lts.sh
@@ -273,7 +273,7 @@ echo -e "\e[32mPatched kernels modules were created successfully\n\e[0m"
 # As a precausion start with unloading the core uvcvideo:
 try_unload_module uvcvideo
 try_unload_module videobuf2_v4l2
-try_unload_module videobuf2_common
+[ ${k_maj_min} -ge 500 ] && try_unload_module videobuf2_common
 try_unload_module videodev
 
 
@@ -305,8 +305,8 @@ if [ $build_usbcore_modules -eq 1 ]; then
 fi
 
 try_module_insert videodev				~/$LINUX_BRANCH-videodev.ko 			/lib/modules/`uname -r`/kernel/drivers/media/v4l2-core/videodev.ko
-try_module_insert videobuf2-common		~/$LINUX_BRANCH-videobuf2-common.ko 	/lib/modules/`uname -r`/kernel/drivers/media/common/videobuf2/videobuf2-common.ko
-try_module_insert videobuf2-v4l2		~/$LINUX_BRANCH-videobuf2-v4l2.ko 		/lib/modules/`uname -r`/kernel/drivers/media/common/videobuf2/videobuf2-v4l2.ko
+[ ${k_maj_min} -ge 500 ] && try_module_insert videobuf2-common		~/$LINUX_BRANCH-videobuf2-common.ko 	/lib/modules/`uname -r`/kernel/drivers/media/common/videobuf2/videobuf2-common.ko
+[ ${k_maj_min} -ge 500 ] && try_module_insert videobuf2-v4l2		~/$LINUX_BRANCH-videobuf2-v4l2.ko 		/lib/modules/`uname -r`/kernel/drivers/media/common/videobuf2/videobuf2-v4l2.ko
 try_module_insert uvcvideo				~/$LINUX_BRANCH-uvcvideo.ko 			/lib/modules/`uname -r`/kernel/drivers/media/usb/uvc/uvcvideo.ko
 try_module_insert hid_sensor_accel_3d 	~/$LINUX_BRANCH-hid-sensor-accel-3d.ko 	/lib/modules/`uname -r`/kernel/drivers/iio/accel/hid-sensor-accel-3d.ko
 try_module_insert hid_sensor_gyro_3d	~/$LINUX_BRANCH-hid-sensor-gyro-3d.ko 	/lib/modules/`uname -r`/kernel/drivers/iio/gyro/hid-sensor-gyro-3d.ko

diff --git a/src/linux/backend-v4l2.cpp b/src/linux/backend-v4l2.cpp
@@ -398,7 +398,7 @@ namespace librealsense
 
             if (nullptr == md_start)
             {
-                LOG_WARNING("Could not parse metadata");
+                LOG_DEBUG("Could not parse metadata");
             }
             set_md_attributes(static_cast<uint8_t>(md_size),md_start);
         }
@@ -1025,7 +1025,7 @@ namespace librealsense
                             {
                                 if(buf.bytesused == 0)
                                 {
-                                    LOG_INFO("Empty video frame arrived, index " << buf.index);
+                                    LOG_DEBUG_V4L("Empty video frame arrived, index " << buf.index);
                                     return;
                                 }
 
@@ -1106,7 +1106,7 @@ namespace librealsense
                             }
                             else
                             {
-                                LOG_INFO("Video frame arrived in idle mode."); // TODO - verification
+                                LOG_DEBUG_V4L("Video frame arrived in idle mode."); // TODO - verification
                             }
                         }
                         else

diff --git a/src/linux/backend-v4l2.h b/src/linux/backend-v4l2.h
@@ -197,17 +197,17 @@ namespace librealsense
                         {
                             if (xioctl(_file_desc, (int)VIDIOC_QBUF, &_dq_buf) < 0)
                             {
-                                LOG_ERROR("xioctl(VIDIOC_QBUF) guard failed for fd " << std::dec << _file_desc);
+                                LOG_DEBUG_V4L("xioctl(VIDIOC_QBUF) guard failed for fd " << std::dec << _file_desc);
                                 if (xioctl(_file_desc, (int)VIDIOC_DQBUF, &_dq_buf) >= 0)
                                 {
-                                    LOG_WARNING("xioctl(VIDIOC_QBUF) Re-enqueue succeeded for fd " << std::dec << _file_desc);
+                                    LOG_DEBUG_V4L("xioctl(VIDIOC_QBUF) Re-enqueue succeeded for fd " << std::dec << _file_desc);
                                     if (xioctl(_file_desc, (int)VIDIOC_QBUF, &_dq_buf) < 0)
-                                        LOG_WARNING("xioctl(VIDIOC_QBUF) re-deque  failed for fd " << std::dec << _file_desc);
+                                        LOG_DEBUG_V4L("xioctl(VIDIOC_QBUF) re-deque  failed for fd " << std::dec << _file_desc);
                                     else
-                                        LOG_WARNING("xioctl(VIDIOC_QBUF) re-deque succeeded for fd " << std::dec << _file_desc);
+                                        LOG_DEBUG_V4L("xioctl(VIDIOC_QBUF) re-deque succeeded for fd " << std::dec << _file_desc);
                                 }
                                 else
-                                    LOG_WARNING("xioctl(VIDIOC_QBUF) Re-enqueue failed for fd " << std::dec << _file_desc);
+                                    LOG_DEBUG_V4L("xioctl(VIDIOC_QBUF) Re-enqueue failed for fd " << std::dec << _file_desc);
                             }
                             else
                                 LOG_DEBUG_V4L("Enqueue (e) buf " << std::dec << _dq_buf.index << " for fd " << _file_desc);