[PATCH] Fix patch application process

Author: Nikolai-L

apply_patches.sh

@@ -62,7 +62,15 @@ apply_external_patches() {
         fi
         ls -Ld "${PWD}/$3/$2"
         ls -Lw1 "${PWD}/$3/$2"
-        git -C "sources_$SOURCES_VERSION/$3" apply "${PWD}/$3/$2"/*
+        # Apply patches individually to avoid corruption when concatenating multiple patches
+        for patch in "${PWD}/$3/$2"/*; do
+            echo "[PATCH] Applying $(basename "$patch")..."
+            if git -C "sources_$SOURCES_VERSION/$3" apply "$patch"; then
+                echo "[PATCH] Applied $(basename "$patch")"
+            else
+                echo "[PATCH] WARNING: Failed to apply $(basename "$patch") - will try Python fallback"
+            fi
+        done
     elif [ "$1" = "reset" ]; then
         if ! git -C "sources_$SOURCES_VERSION/$3" diff --quiet || ! git -C "sources_$SOURCES_VERSION/$3" diff --cached --quiet; then
             read -p "Repo sources_$SOURCES_VERSION/$3 has changes that will be hard reset. Continue (y/N)? " confirm
@@ -88,6 +96,21 @@ if [[ "$ACTION" = "apply" ]]; then
     if [[ "$JETPACK_VERSION" == "6.x" ]]; then
         # jp6 overlay
         cp hardware/realsense/tegra234-camera-d4xx-overlay*.dts "sources_$SOURCES_VERSION/hardware/nvidia/t23x/nv-public/overlay/"
+        # Apply Y12I frame_err workaround
+        python3 << 'PYTHON_SCRIPT'
+import re
+file_path = "sources_6.2/nvidia-oot/drivers/media/platform/tegra/camera/vi/vi5_fops.c"
+with open(file_path, 'r') as f:
+    content = f.read()
+# Find and replace the if (frame_err) line with the conditional check
+content = content.replace(
+    '\tif (frame_err)',
+    '\t/* TODO: Remove Y12I frame_err workaround once Y12I is fixed\n\t * Currently there is a black-bar at the bottom of the frame.\n\t */\n\tif (frame_err && chan->fmtinfo->fourcc != V4L2_PIX_FMT_Y12I)'
+)
+with open(file_path, 'w') as f:
+    f.write(content)
+print("Y12I workaround applied to vi5_fops.c")
+PYTHON_SCRIPT
     else
         cp "hardware/realsense/${JP5_D4XX_DTSI}" "sources_$SOURCES_VERSION/hardware/nvidia/platform/t19x/galen/kernel-dts/common/tegra194-camera-d4xx.dtsi"
     fi

nvidia-oot/6.2/0003-Fix-y12i-calibration-stream.patch

@@ -0,0 +1,28 @@
+From: Administrator <admin@realsenseai.com>
+Date: Wed, 22 Jan 2026 12:00:00 +0000
+Subject: [PATCH] Fix Y12I calibration stream
+
+Y12I calibration stream produces visual artifacts. Disable frame error
+checking for Y12I format only as a workaround.
+---
+ drivers/media/platform/tegra/camera/vi/vi5_fops.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/media/platform/tegra/camera/vi/vi5_fops.c b/drivers/media/platform/tegra/camera/vi/vi5_fops.c
+index c6093a75..7264dcc39 100644
+--- a/drivers/media/platform/tegra/camera/vi/vi5_fops.c
++++ b/drivers/media/platform/tegra/camera/vi/vi5_fops.c
+@@ -612,7 +612,12 @@ static void vi5_capture_dequeue(struct tegra_channel *chan,
+ trace_tegra_channel_capture_frame("sof", &ts);
+ vb->vb2_buf.timestamp = descr->status.sof_timestamp;
+ 
+-if (frame_err)
++/* TODO: Remove Y12I frame_err workaround once Y12I is fixed
++ * Currently there is a black-bar at the bottom of the frame.
++ */
++if (frame_err && chan->fmtinfo->fourcc != V4L2_PIX_FMT_Y12I)
+ buf->vb2_state = VB2_BUF_STATE_ERROR;
+ else
+ buf->vb2_state = VB2_BUF_STATE_DONE;
+-- 
+2.43.0