Skip to content

fix Y12I calibration stream #312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Kontra2B wants to merge 1 commit into from
Closed

fix Y12I calibration stream #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions kernel/realsense/d4xx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,6 +1014,15 @@ static const struct ds5_resolution d46x_calibration_sizes[] = {
},
};

static const struct ds5_resolution ds5_calibration_sizes[] = {
{
.width = 1280,
.height = 800,
.framerates = ds5_framerate_15_25,
.n_framerates = ARRAY_SIZE(ds5_framerate_15_25),
},
};

static const struct ds5_resolution ds5_size_imu[] = {
{
.width = 32,
Expand Down Expand Up @@ -1111,8 +1120,8 @@ static const struct ds5_format ds5_y_formats_ds5u[] = {
}, {
.data_type = GMSL_CSI_DT_RGB_888, /* 24-bit Calibration */
.mbus_code = MEDIA_BUS_FMT_RGB888_1X24, /* FIXME */
.n_resolutions = ARRAY_SIZE(d43x_calibration_sizes),
.resolutions = d43x_calibration_sizes,
.n_resolutions = ARRAY_SIZE(ds5_calibration_sizes),
.resolutions = ds5_calibration_sizes,
},
};

Expand Down Expand Up @@ -1713,9 +1722,7 @@ static int ds5_configure(struct ds5 *state)
#ifdef CONFIG_VIDEO_D4XX_SERDES
data_type1 = sensor->config.format->data_type;
data_type2 = state->is_imu ? 0x00 : md_fmt;
/* do not have metadata for y12i */
if (state->is_y8 && data_type1 == GMSL_CSI_DT_RGB_888)
data_type2 = 0;

vc_id = state->g_ctx.dst_vc;

ret = ds5_setup_pipeline(state, data_type1, data_type2, sensor->pipe_id,
Expand Down
14 changes: 14 additions & 0 deletions nvidia-oot/6.0/0003-Fix-y12i-calibration-stream.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/drivers/media/platform/tegra/camera/vi/vi5_fops.c b/drivers/media/platform/tegra/camera/vi/vi5_fops.c
index 7d07ccd7..c64dcc38 100644
--- a/drivers/media/platform/tegra/camera/vi/vi5_fops.c
+++ b/drivers/media/platform/tegra/camera/vi/vi5_fops.c
@@ -612,7 +612,7 @@ 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)
+ if (false && frame_err)
buf->vb2_state = VB2_BUF_STATE_ERROR;
else
buf->vb2_state = VB2_BUF_STATE_DONE;

1 change: 1 addition & 0 deletions nvidia-oot/6.1/0003-Fix-y12i-calibration-stream.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../6.0/0003-Fix-y12i-calibration-stream.patch
1 change: 1 addition & 0 deletions nvidia-oot/6.2/0003-Fix-y12i-calibration-stream.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../6.0/0003-Fix-y12i-calibration-stream.patch