Skip to content

Commit b2968df

Browse files
Nikolai-Lymodlin
authored andcommitted
[PATCH] Fix Y12I streaming error handling in vi5_capture_dequeue (realsenseai#338)
Bump driver version to 1.0.1.33 (realsenseai#339)
1 parent e42f099 commit b2968df

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

kernel/realsense/d4xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5925,4 +5925,4 @@ MODULE_AUTHOR("Guennadi Liakhovetski <guennadi.liakhovetski@intel.com>,\n\
59255925
Shikun Ding <shikun.ding@intel.com>,\n\
59265926
Dmitry Perchanov <dmitry.perchanov@intel.com>");
59275927
MODULE_LICENSE("GPL v2");
5928-
MODULE_VERSION("1.0.1.32");
5928+
MODULE_VERSION("1.0.1.33");

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ diff --git a/drivers/media/platform/tegra/camera/vi/vi5_fops.c b/drivers/media/p
22
index 7d07ccd7..c64dcc38 100644
33
--- a/drivers/media/platform/tegra/camera/vi/vi5_fops.c
44
+++ b/drivers/media/platform/tegra/camera/vi/vi5_fops.c
5-
@@ -612,7 +612,8 @@ static void vi5_capture_dequeue(struct tegra_channel *chan,
5+
@@ -582,7 +641,10 @@ static void vi5_capture_dequeue(struct tegra_channel *chan,
66
trace_tegra_channel_capture_frame("sof", &ts);
77
vb->vb2_buf.timestamp = descr->status.sof_timestamp;
88

99
- if (frame_err)
10-
+ /* TODO: Remove the branch or process the error for Y12I only */
11-
+ if (false && frame_err)
10+
+ /* TODO: Remove Y12I frame_err workaround once Y12I is fixed
11+
+ * Currently there is a black-bar at the bottom of the frame.
12+
+ */
13+
+ if (frame_err && chan->fmtinfo->fourcc != V4L2_PIX_FMT_Y12I)
1214
buf->vb2_state = VB2_BUF_STATE_ERROR;
1315
else
1416
buf->vb2_state = VB2_BUF_STATE_DONE;
15-

0 commit comments

Comments
 (0)