On Wed, Nov 11, 2020 at 6:38 AM Stanimir Varbanov <stanimir.varbanov@xxxxxxxxxx> wrote: > > After re-design of encoder driver this helper is not needed > anymore. > > Signed-off-by: Stanimir Varbanov <stanimir.varbanov@xxxxxxxxxx> > --- > 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 490c026b58a3..51c80417f361 100644 > --- a/drivers/media/platform/qcom/venus/helpers.c > +++ b/drivers/media/platform/qcom/venus/helpers.c > @@ -1406,49 +1406,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 231af29667e7..3eae2acbcc8e 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 > Reviewed-by: Fritz Koenig <frkoenig@xxxxxxxxxxxx>