From: Stanimir Varbanov <stanimir.varbanov@linaro.org>
To: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Vikash Garodia <vgarodia@codeaurora.org>,
Alexandre Courbot <acourbot@chromium.org>,
Tomasz Figa <tfiga@chromium.org>,
Dikshita Agarwal <dikshita@codeaurora.org>,
Stanimir Varbanov <stanimir.varbanov@linaro.org>
Subject: [PATCH 4/4] venus: helpers: Delete unused stop streaming helper
Date: Fri, 23 Oct 2020 15:57:04 +0300 [thread overview]
Message-ID: <20201023125704.4984-5-stanimir.varbanov@linaro.org> (raw)
In-Reply-To: <20201023125704.4984-1-stanimir.varbanov@linaro.org>
After re-design of encoder driver this helper is not needed
anymore.
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
---
drivers/media/platform/qcom/venus/helpers.c | 43 ---------------------
drivers/media/platform/qcom/venus/helpers.h | 1 -
2 files changed, 44 deletions(-)
diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c
index 8d0ca70d740d..1668cbaf3c72 100644
--- a/drivers/media/platform/qcom/venus/helpers.c
+++ b/drivers/media/platform/qcom/venus/helpers.c
@@ -1404,49 +1404,6 @@ void venus_helper_buffers_done(struct venus_inst *inst, unsigned int type,
}
EXPORT_SYMBOL_GPL(venus_helper_buffers_done);
-void venus_helper_vb2_stop_streaming(struct vb2_queue *q)
-{
- struct venus_inst *inst = vb2_get_drv_priv(q);
- struct venus_core *core = inst->core;
- int ret;
-
- mutex_lock(&inst->lock);
-
- if (inst->streamon_out & inst->streamon_cap) {
- ret = hfi_session_stop(inst);
- ret |= hfi_session_unload_res(inst);
- ret |= venus_helper_unregister_bufs(inst);
- ret |= venus_helper_intbufs_free(inst);
- ret |= hfi_session_deinit(inst);
-
- if (inst->session_error || core->sys_error)
- ret = -EIO;
-
- if (ret)
- hfi_session_abort(inst);
-
- venus_helper_free_dpb_bufs(inst);
-
- venus_pm_load_scale(inst);
- INIT_LIST_HEAD(&inst->registeredbufs);
- }
-
- venus_helper_buffers_done(inst, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
- VB2_BUF_STATE_ERROR);
- venus_helper_buffers_done(inst, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE,
- VB2_BUF_STATE_ERROR);
-
- if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
- inst->streamon_out = 0;
- else
- inst->streamon_cap = 0;
-
- venus_pm_release_core(inst);
-
- mutex_unlock(&inst->lock);
-}
-EXPORT_SYMBOL_GPL(venus_helper_vb2_stop_streaming);
-
int venus_helper_process_initial_cap_bufs(struct venus_inst *inst)
{
struct v4l2_m2m_ctx *m2m_ctx = inst->m2m_ctx;
diff --git a/drivers/media/platform/qcom/venus/helpers.h b/drivers/media/platform/qcom/venus/helpers.h
index dca4794c05d9..b8d6c5085d4f 100644
--- a/drivers/media/platform/qcom/venus/helpers.h
+++ b/drivers/media/platform/qcom/venus/helpers.h
@@ -20,7 +20,6 @@ int venus_helper_vb2_buf_init(struct vb2_buffer *vb);
int venus_helper_vb2_buf_prepare(struct vb2_buffer *vb);
void venus_helper_vb2_buf_queue(struct vb2_buffer *vb);
void venus_helper_process_buf(struct vb2_buffer *vb);
-void venus_helper_vb2_stop_streaming(struct vb2_queue *q);
int venus_helper_vb2_start_streaming(struct venus_inst *inst);
void venus_helper_m2m_device_run(void *priv);
void venus_helper_m2m_job_abort(void *priv);
--
2.17.1
prev parent reply other threads:[~2020-10-23 12:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-23 12:57 [PATCH 0/4] Venus stateful encoder compliance Stanimir Varbanov
2020-10-23 12:57 ` [PATCH 1/4] venus: hfi: Use correct state in unload resources Stanimir Varbanov
2020-10-23 12:57 ` [PATCH 2/4] venus: helpers: Add a new helper for buffer processing Stanimir Varbanov
2020-10-23 12:57 ` [PATCH 3/4] venus: venc: Handle reset encoder state Stanimir Varbanov
2020-11-03 1:16 ` Fritz Koenig
2020-11-04 10:44 ` vgarodia
2020-11-05 11:51 ` Stanimir Varbanov
2020-11-10 5:48 ` Fritz Koenig
2020-11-10 17:37 ` Fritz Koenig
2020-10-23 12:57 ` Stanimir Varbanov [this message]
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=20201023125704.4984-5-stanimir.varbanov@linaro.org \
--to=stanimir.varbanov@linaro.org \
--cc=acourbot@chromium.org \
--cc=dikshita@codeaurora.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=tfiga@chromium.org \
--cc=vgarodia@codeaurora.org \
/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;
as well as URLs for NNTP newsgroup(s).