Skip to content
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.

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

DSO-18280 - possible regression solution #113

Merged
merged 1 commit into from
Jun 15, 2022
Merged
Changes from all commits
Commits
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
51 changes: 51 additions & 0 deletions kernel/nvidia/0063-DSO-18280-possible-solution.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
From 5e57607cf3ddd8ba555e4e2038155c6e4598fac5 Mon Sep 17 00:00:00 2001
From: Dmitry Perchanov <dmitry.perchanov@intel.com>
Date: Wed, 15 Jun 2022 14:03:55 +0300
Subject: [PATCH] get back PR83 sleep WA to prevent regression - add delay
before start streaming - add delay before stop streaming - notify fw by
sending stop stream op in case of error

Signed-off-by: Dmitry Perchanov <dmitry.perchanov@intel.com>
---
drivers/media/i2c/d4xx.c | 11 +++++++++++
1 file changed, 11 insertions(+)

diff --git a/drivers/media/i2c/d4xx.c b/drivers/media/i2c/d4xx.c
index 72de809..bbcda89 100644
--- a/drivers/media/i2c/d4xx.c
+++ b/drivers/media/i2c/d4xx.c
@@ -2606,6 +2606,10 @@ static int ds5_mux_s_stream(struct v4l2_subdev *sd, int on)
ret = ds5_configure(state);
if (ret)
goto restore_s_state;
+ /* TODO
+ * WA to prevent simultaneous multi-stream starting failure sometimes.
+ * This should be replaced by a proper fix in cam fw later. */
+ msleep_range(100 + 10 * stream_id);

ret = ds5_write(state, DS5_START_STOP_STREAM,
DS5_STREAM_START | stream_id);
@@ -2626,6 +2630,9 @@ static int ds5_mux_s_stream(struct v4l2_subdev *sd, int on)
if (DS5_START_MAX_COUNT == i) {
dev_err(&state->client->dev,
"start streaming failed, exit on timeout\n");
+ /* notify fw */
+ ret = ds5_write(state, DS5_START_STOP_STREAM,
+ DS5_STREAM_STOP | stream_id);
ret = -EAGAIN;
goto restore_s_state;
} else {
@@ -2633,6 +2640,10 @@ static int ds5_mux_s_stream(struct v4l2_subdev *sd, int on)
i * DS5_START_POLL_TIME);
}
} else {
+ /* TODO
+ * WA to prevent simultaneous multi-stream starting failure sometimes.
+ * This should be replaced by a proper fix in cam fw later. */
+ msleep_range(100 + 10 * stream_id);
ret = ds5_write(state, DS5_START_STOP_STREAM,
DS5_STREAM_STOP | stream_id);
if (ret < 0)
--
2.17.1