From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexandre Courbot Subject: Re: [PATCH 07/10] venus: helpers: add three more helper functions Date: Thu, 24 Jan 2019 17:43:24 +0900 Message-ID: References: <20190117162008.25217-1-stanimir.varbanov@linaro.org> <20190117162008.25217-8-stanimir.varbanov@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Return-path: In-Reply-To: <20190117162008.25217-8-stanimir.varbanov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org To: Stanimir Varbanov Cc: Linux Media Mailing List , Mauro Carvalho Chehab , Hans Verkuil , LKML , linux-arm-msm@vger.kernel.org, Vikash Garodia , Tomasz Figa , Malathi Gottam List-Id: linux-arm-msm@vger.kernel.org On Fri, Jan 18, 2019 at 1:21 AM Stanimir Varbanov wrote: > > This adds three more helper functions: > * for internal buffers reallocation, applicable when we are doing > dynamic resolution change > * for initial buffer processing of capture and output queue buffer > types > > All of them will be needed for stateful Codec API support. > > Signed-off-by: Stanimir Varbanov > --- > drivers/media/platform/qcom/venus/helpers.c | 82 +++++++++++++++++++++ > drivers/media/platform/qcom/venus/helpers.h | 2 + > 2 files changed, 84 insertions(+) > > diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c > index f33bbfea3576..637ce7b82d94 100644 > --- a/drivers/media/platform/qcom/venus/helpers.c > +++ b/drivers/media/platform/qcom/venus/helpers.c > @@ -322,6 +322,52 @@ int venus_helper_intbufs_free(struct venus_inst *inst) > } > EXPORT_SYMBOL_GPL(venus_helper_intbufs_free); > > +int venus_helper_intbufs_realloc(struct venus_inst *inst) Does this function actually reallocate buffers? It seems to just free what we had previously. > +{ > + enum hfi_version ver = inst->core->res->hfi_version; > + struct hfi_buffer_desc bd; > + struct intbuf *buf, *n; > + int ret; > + > + list_for_each_entry_safe(buf, n, &inst->internalbufs, list) { > + if (buf->type == HFI_BUFFER_INTERNAL_PERSIST || > + buf->type == HFI_BUFFER_INTERNAL_PERSIST_1) > + continue; > + > + memset(&bd, 0, sizeof(bd)); > + bd.buffer_size = buf->size; > + bd.buffer_type = buf->type; > + bd.num_buffers = 1; > + bd.device_addr = buf->da; > + bd.response_required = true; > + > + ret = hfi_session_unset_buffers(inst, &bd); > + > + dma_free_attrs(inst->core->dev, buf->size, buf->va, buf->da, > + buf->attrs); > + > + list_del_init(&buf->list); > + kfree(buf); > + } > + > + ret = intbufs_set_buffer(inst, HFI_BUFFER_INTERNAL_SCRATCH(ver)); > + if (ret) > + goto err; > + > + ret = intbufs_set_buffer(inst, HFI_BUFFER_INTERNAL_SCRATCH_1(ver)); > + if (ret) > + goto err; > + > + ret = intbufs_set_buffer(inst, HFI_BUFFER_INTERNAL_SCRATCH_2(ver)); > + if (ret) > + goto err; > + > + return 0; > +err: > + return ret; > +} > +EXPORT_SYMBOL_GPL(venus_helper_intbufs_realloc); > + > static u32 load_per_instance(struct venus_inst *inst) > { > u32 mbs; > @@ -1050,6 +1096,42 @@ void venus_helper_vb2_stop_streaming(struct vb2_queue *q) > } > 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; > + struct v4l2_m2m_buffer *buf, *n; > + int ret; > + > + v4l2_m2m_for_each_dst_buf_safe(m2m_ctx, buf, n) { > + ret = session_process_buf(inst, &buf->vb); > + if (ret) { > + return_buf_error(inst, &buf->vb); > + return ret; > + } > + } > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(venus_helper_process_initial_cap_bufs); > + > +int venus_helper_process_initial_out_bufs(struct venus_inst *inst) > +{ > + struct v4l2_m2m_ctx *m2m_ctx = inst->m2m_ctx; > + struct v4l2_m2m_buffer *buf, *n; > + int ret; > + > + v4l2_m2m_for_each_src_buf_safe(m2m_ctx, buf, n) { > + ret = session_process_buf(inst, &buf->vb); > + if (ret) { > + return_buf_error(inst, &buf->vb); > + return ret; > + } > + } > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(venus_helper_process_initial_out_bufs); > + > int venus_helper_vb2_start_streaming(struct venus_inst *inst) > { > struct venus_core *core = inst->core; > diff --git a/drivers/media/platform/qcom/venus/helpers.h b/drivers/media/platform/qcom/venus/helpers.h > index 24faae5abd93..2ec1c1a8b416 100644 > --- a/drivers/media/platform/qcom/venus/helpers.h > +++ b/drivers/media/platform/qcom/venus/helpers.h > @@ -69,4 +69,6 @@ int venus_helper_intbufs_realloc(struct venus_inst *inst); > int venus_helper_queue_dpb_bufs(struct venus_inst *inst); > int venus_helper_unregister_bufs(struct venus_inst *inst); > int venus_helper_load_scale_clocks(struct venus_core *core); > +int venus_helper_process_initial_cap_bufs(struct venus_inst *inst); > +int venus_helper_process_initial_out_bufs(struct venus_inst *inst); > #endif > -- > 2.17.1 >