From: Dikshita Agarwal <quic_dikshita@quicinc.com>
To: Vikash Garodia <quic_vgarodia@quicinc.com>,
Abhinav Kumar <quic_abhinavk@quicinc.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
"Rob Herring" <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
"Conor Dooley" <conor+dt@kernel.org>,
Philipp Zabel <p.zabel@pengutronix.de>
Cc: "Hans Verkuil" <hverkuil@xs4all.nl>,
"Sebastian Fricke" <sebastian.fricke@collabora.com>,
"Bryan O'Donoghue" <bryan.odonoghue@linaro.org>,
"Dmitry Baryshkov" <dmitry.baryshkov@linaro.org>,
"Neil Armstrong" <neil.armstrong@linaro.org>,
"Nicolas Dufresne" <nicolas@ndufresne.ca>,
"Uwe Kleine-König" <u.kleine-koenig@baylibre.com>,
"Jianhua Lu" <lujianhua000@gmail.com>,
"Stefan Schmidt" <stefan.schmidt@linaro.org>,
linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
"Dikshita Agarwal" <quic_dikshita@quicinc.com>,
"Vedang Nagar" <quic_vnagar@quicinc.com>
Subject: [PATCH v9 26/28] media: iris: add check to allow sub states transitions
Date: Thu, 12 Dec 2024 17:21:48 +0530 [thread overview]
Message-ID: <20241212-qcom-video-iris-v9-26-e8c2c6bd4041@quicinc.com> (raw)
In-Reply-To: <20241212-qcom-video-iris-v9-0-e8c2c6bd4041@quicinc.com>
From: Vedang Nagar <quic_vnagar@quicinc.com>
Based on state machine design, add allow checks to transition from one
sub-state to another sub-states.
Signed-off-by: Vedang Nagar <quic_vnagar@quicinc.com>
Tested-by: Stefan Schmidt <stefan.schmidt@linaro.org> # x1e80100 (Dell
Reviewed-by: Stefan Schmidt <stefan.schmidt@linaro.org>
Signed-off-by: Dikshita Agarwal <quic_dikshita@quicinc.com>
---
.../platform/qcom/iris/iris_hfi_gen1_command.c | 12 ++++++-
drivers/media/platform/qcom/iris/iris_state.c | 40 ++++++++++++++++++++++
drivers/media/platform/qcom/iris/iris_state.h | 3 ++
3 files changed, 54 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c b/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c
index e1fbbb3c196d..64f887d9a17d 100644
--- a/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c
+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c
@@ -135,6 +135,9 @@ static int iris_hfi_gen1_session_start(struct iris_inst *inst, u32 plane)
if (!V4L2_TYPE_IS_OUTPUT(plane))
return 0;
+ if (inst->sub_state & IRIS_INST_SUB_LOAD_RESOURCES)
+ return 0;
+
reinit_completion(&inst->completion);
iris_hfi_gen1_packet_session_cmd(inst, &packet, HFI_CMD_SESSION_LOAD_RESOURCES);
@@ -153,7 +156,11 @@ static int iris_hfi_gen1_session_start(struct iris_inst *inst, u32 plane)
if (ret)
return ret;
- return iris_wait_for_session_response(inst, false);
+ ret = iris_wait_for_session_response(inst, false);
+ if (ret)
+ return ret;
+
+ return iris_inst_change_sub_state(inst, 0, IRIS_INST_SUB_LOAD_RESOURCES);
}
static int iris_hfi_gen1_session_stop(struct iris_inst *inst, u32 plane)
@@ -180,6 +187,9 @@ static int iris_hfi_gen1_session_stop(struct iris_inst *inst, u32 plane)
ret = iris_hfi_queue_cmd_write(core, &pkt, pkt.shdr.hdr.size);
if (!ret)
ret = iris_wait_for_session_response(inst, false);
+
+ iris_inst_change_sub_state(inst, IRIS_INST_SUB_LOAD_RESOURCES, 0);
+
iris_helper_buffers_done(inst, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
VB2_BUF_STATE_ERROR);
iris_helper_buffers_done(inst, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE,
diff --git a/drivers/media/platform/qcom/iris/iris_state.c b/drivers/media/platform/qcom/iris/iris_state.c
index f12306e735ec..5976e926c83d 100644
--- a/drivers/media/platform/qcom/iris/iris_state.c
+++ b/drivers/media/platform/qcom/iris/iris_state.c
@@ -105,6 +105,43 @@ int iris_inst_state_change_streamoff(struct iris_inst *inst, u32 plane)
return iris_inst_change_state(inst, new_state);
}
+static bool iris_inst_allow_sub_state(struct iris_inst *inst, enum iris_inst_sub_state sub_state)
+{
+ if (!sub_state)
+ return true;
+
+ switch (inst->state) {
+ case IRIS_INST_INIT:
+ if (sub_state & IRIS_INST_SUB_LOAD_RESOURCES)
+ return true;
+ return false;
+ case IRIS_INST_INPUT_STREAMING:
+ if (sub_state & (IRIS_INST_SUB_FIRST_IPSC | IRIS_INST_SUB_DRC |
+ IRIS_INST_SUB_DRAIN | IRIS_INST_SUB_INPUT_PAUSE))
+ return true;
+ return false;
+ case IRIS_INST_OUTPUT_STREAMING:
+ if (sub_state & (IRIS_INST_SUB_DRC_LAST |
+ IRIS_INST_SUB_DRAIN_LAST | IRIS_INST_SUB_OUTPUT_PAUSE))
+ return true;
+ return false;
+ case IRIS_INST_STREAMING:
+ if (sub_state & (IRIS_INST_SUB_DRC | IRIS_INST_SUB_DRAIN |
+ IRIS_INST_SUB_DRC_LAST | IRIS_INST_SUB_DRAIN_LAST |
+ IRIS_INST_SUB_INPUT_PAUSE | IRIS_INST_SUB_OUTPUT_PAUSE))
+ return true;
+ return false;
+ case IRIS_INST_DEINIT:
+ if (sub_state & (IRIS_INST_SUB_DRC | IRIS_INST_SUB_DRAIN |
+ IRIS_INST_SUB_DRC_LAST | IRIS_INST_SUB_DRAIN_LAST |
+ IRIS_INST_SUB_INPUT_PAUSE | IRIS_INST_SUB_OUTPUT_PAUSE))
+ return true;
+ return false;
+ default:
+ return false;
+ }
+}
+
int iris_inst_change_sub_state(struct iris_inst *inst,
enum iris_inst_sub_state clear_sub_state,
enum iris_inst_sub_state set_sub_state)
@@ -124,6 +161,9 @@ int iris_inst_change_sub_state(struct iris_inst *inst,
prev_sub_state = inst->sub_state;
+ if (!iris_inst_allow_sub_state(inst, set_sub_state))
+ return -EINVAL;
+
inst->sub_state |= set_sub_state;
inst->sub_state &= ~clear_sub_state;
diff --git a/drivers/media/platform/qcom/iris/iris_state.h b/drivers/media/platform/qcom/iris/iris_state.h
index a5c0cad4a78c..78c61aac5e7e 100644
--- a/drivers/media/platform/qcom/iris/iris_state.h
+++ b/drivers/media/platform/qcom/iris/iris_state.h
@@ -113,6 +113,8 @@ enum iris_inst_state {
* @IRIS_INST_SUB_OUTPUT_PAUSE: last buffer is received form firmware as part
* of drc sequence. This indicates that
* firmware is paused to process any further output frames.
+ * @IRIS_INST_SUB_LOAD_RESOURCES: indicates all the resources have been loaded by the
+ * firmware and it is ready for processing.
*/
enum iris_inst_sub_state {
IRIS_INST_SUB_FIRST_IPSC = BIT(0),
@@ -122,6 +124,7 @@ enum iris_inst_sub_state {
IRIS_INST_SUB_DRAIN_LAST = BIT(4),
IRIS_INST_SUB_INPUT_PAUSE = BIT(5),
IRIS_INST_SUB_OUTPUT_PAUSE = BIT(6),
+ IRIS_INST_SUB_LOAD_RESOURCES = BIT(7),
};
int iris_inst_change_state(struct iris_inst *inst,
--
2.34.1
next prev parent reply other threads:[~2024-12-12 11:54 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-12 11:51 [PATCH v9 00/28] Qualcomm iris video decoder driver Dikshita Agarwal
2024-12-12 11:51 ` [PATCH v9 01/28] dt-bindings: media: Add video support for QCOM SM8550 SoC Dikshita Agarwal
2024-12-12 11:51 ` [PATCH v9 02/28] media: iris: add platform driver for iris video device Dikshita Agarwal
2024-12-12 11:51 ` [PATCH v9 03/28] media: iris: implement iris v4l2 file ops Dikshita Agarwal
2024-12-12 11:51 ` [PATCH v9 04/28] media: iris: introduce iris core state management with shared queues Dikshita Agarwal
2025-01-15 12:45 ` Markus Elfring
2024-12-12 11:51 ` [PATCH v9 05/28] media: iris: implement video firmware load/unload Dikshita Agarwal
2024-12-12 11:51 ` [PATCH v9 06/28] media: iris: implement boot sequence of the firmware Dikshita Agarwal
2024-12-12 11:51 ` [PATCH v9 07/28] media: iris: introduce host firmware interface with necessary hooks Dikshita Agarwal
2024-12-12 11:51 ` [PATCH v9 08/28] media: iris: implement power management Dikshita Agarwal
2024-12-12 11:51 ` [PATCH v9 09/28] media: iris: implement reqbuf ioctl with vb2_queue_setup Dikshita Agarwal
2024-12-12 11:51 ` [PATCH v9 10/28] media: iris: implement s_fmt, g_fmt and try_fmt ioctls Dikshita Agarwal
2024-12-12 11:51 ` [PATCH v9 11/28] media: iris: implement g_selection ioctl Dikshita Agarwal
2024-12-12 11:51 ` [PATCH v9 12/28] media: iris: implement enum_fmt and enum_framesizes ioctls Dikshita Agarwal
2024-12-12 11:51 ` [PATCH v9 13/28] media: iris: implement subscribe_event and unsubscribe_event ioctls Dikshita Agarwal
2024-12-12 11:51 ` [PATCH v9 14/28] media: iris: implement iris v4l2_ctrl_ops Dikshita Agarwal
2024-12-12 11:51 ` [PATCH v9 15/28] media: iris: implement query_cap ioctl Dikshita Agarwal
2024-12-12 11:51 ` [PATCH v9 16/28] media: iris: implement vb2 streaming ops Dikshita Agarwal
2024-12-12 11:51 ` [PATCH v9 17/28] media: iris: implement set properties to firmware during streamon Dikshita Agarwal
2024-12-12 11:51 ` [PATCH v9 18/28] media: iris: subscribe parameters and properties to firmware for hfi_gen2 Dikshita Agarwal
2024-12-12 11:51 ` [PATCH v9 19/28] media: iris: allocate, initialize and queue internal buffers Dikshita Agarwal
2024-12-12 11:51 ` [PATCH v9 20/28] media: iris: implement vb2 ops for buf_queue and firmware response Dikshita Agarwal
2024-12-12 11:51 ` [PATCH v9 21/28] media: iris: add support for dynamic resolution change Dikshita Agarwal
2024-12-12 11:51 ` [PATCH v9 22/28] media: iris: handle streamoff/on from client in " Dikshita Agarwal
2024-12-12 11:51 ` [PATCH v9 23/28] media: iris: add support for drain sequence Dikshita Agarwal
2024-12-12 11:51 ` [PATCH v9 24/28] media: iris: add check whether the video session is supported or not Dikshita Agarwal
2024-12-12 11:51 ` [PATCH v9 25/28] media: iris: implement power scaling for vpu2 and vpu3 Dikshita Agarwal
2024-12-12 11:51 ` Dikshita Agarwal [this message]
2024-12-12 11:51 ` [PATCH v9 27/28] media: iris: enable video driver probe of SM8250 SoC Dikshita Agarwal
2024-12-23 10:30 ` Mauro Carvalho Chehab
2024-12-23 10:51 ` Dikshita Agarwal
2025-01-07 13:57 ` Nicolas Dufresne
2025-01-08 7:43 ` Dikshita Agarwal
2025-01-08 7:47 ` Hans Verkuil
2025-01-08 8:51 ` Dikshita Agarwal
2025-01-08 8:55 ` Hans Verkuil
2025-01-08 10:21 ` Dikshita Agarwal
2025-01-08 10:43 ` Hans Verkuil
2025-01-08 11:12 ` Dikshita Agarwal
2025-01-08 14:52 ` Mauro Carvalho Chehab
2025-01-09 8:43 ` Dikshita Agarwal
2025-01-09 9:49 ` Stanimir Varbanov
2025-01-09 10:37 ` Hans Verkuil
2025-01-09 15:11 ` Johan Hovold
2025-01-09 17:48 ` Vikash Garodia
2025-01-10 14:28 ` Johan Hovold
2025-01-10 17:30 ` Dikshita Agarwal
2025-01-10 18:01 ` Dmitry Baryshkov
2025-01-11 10:45 ` Hans Verkuil
2025-01-13 8:51 ` Dmitry Baryshkov
2025-01-15 15:15 ` Bryan O'Donoghue
2025-02-03 8:39 ` Johan Hovold
2025-02-03 15:37 ` Dmitry Baryshkov
2025-02-04 9:52 ` Johan Hovold
2025-02-04 15:35 ` Dmitry Baryshkov
2025-02-04 16:22 ` Johan Hovold
2025-01-10 0:12 ` Dmitry Baryshkov
2025-01-15 22:49 ` Bryan O'Donoghue
2025-01-15 22:51 ` Bryan O'Donoghue
2025-01-16 1:23 ` Dmitry Baryshkov
2024-12-12 11:51 ` [PATCH v9 28/28] media: MAINTAINERS: add Qualcomm iris video accelerator driver Dikshita Agarwal
2024-12-14 11:04 ` [PATCH v9 00/28] Qualcomm iris video decoder driver Krzysztof Kozlowski
2024-12-16 14:48 ` Neil Armstrong
2025-01-06 12:36 ` Joel Stanley
2025-01-06 12:46 ` Joel Stanley
2025-01-08 9:54 ` Dikshita Agarwal
2025-01-08 9:52 ` Dikshita Agarwal
2025-01-08 11:00 ` Dmitry Baryshkov
2025-01-09 14:58 ` Johan Hovold
2025-01-22 15:34 ` Stefan Schmidt
2025-02-03 8:43 ` Johan Hovold
2025-02-03 9:27 ` Vikash Garodia
2025-01-15 22:57 ` Bryan O'Donoghue
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241212-qcom-video-iris-v9-26-e8c2c6bd4041@quicinc.com \
--to=quic_dikshita@quicinc.com \
--cc=bryan.odonoghue@linaro.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.baryshkov@linaro.org \
--cc=hverkuil@xs4all.nl \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=lujianhua000@gmail.com \
--cc=mchehab@kernel.org \
--cc=neil.armstrong@linaro.org \
--cc=nicolas@ndufresne.ca \
--cc=p.zabel@pengutronix.de \
--cc=quic_abhinavk@quicinc.com \
--cc=quic_vgarodia@quicinc.com \
--cc=quic_vnagar@quicinc.com \
--cc=robh@kernel.org \
--cc=sebastian.fricke@collabora.com \
--cc=stefan.schmidt@linaro.org \
--cc=u.kleine-koenig@baylibre.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®