media: venus: helpers: add a helper function to set dynamic buffer mode

Adds a new helper function to set dynamic buffer mode if it is
supported by current HFI version. The dynamic buffer mode is
set unconditionally for both decoder outputs.

Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
Tested-by: Alexandre Courbot <acourbot@chromium.org>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Stanimir Varbanov 2018-07-05 09:03:48 -04:00 committed by Mauro Carvalho Chehab
parent f03835204f
commit 2b0a8517fb
3 changed files with 26 additions and 12 deletions

View File

@ -524,6 +524,28 @@ int venus_helper_set_color_format(struct venus_inst *inst, u32 pixfmt)
}
EXPORT_SYMBOL_GPL(venus_helper_set_color_format);
int venus_helper_set_dyn_bufmode(struct venus_inst *inst)
{
const u32 ptype = HFI_PROPERTY_PARAM_BUFFER_ALLOC_MODE;
struct hfi_buffer_alloc_mode mode;
int ret;
if (!is_dynamic_bufmode(inst))
return 0;
mode.type = HFI_BUFFER_OUTPUT;
mode.mode = HFI_BUFFER_MODE_DYNAMIC;
ret = hfi_session_set_property(inst, ptype, &mode);
if (ret)
return ret;
mode.type = HFI_BUFFER_OUTPUT2;
return hfi_session_set_property(inst, ptype, &mode);
}
EXPORT_SYMBOL_GPL(venus_helper_set_dyn_bufmode);
static void delayed_process_buf_func(struct work_struct *work)
{
struct venus_buffer *buf, *n;

View File

@ -40,6 +40,7 @@ int venus_helper_set_output_resolution(struct venus_inst *inst,
int venus_helper_set_num_bufs(struct venus_inst *inst, unsigned int input_bufs,
unsigned int output_bufs);
int venus_helper_set_color_format(struct venus_inst *inst, u32 fmt);
int venus_helper_set_dyn_bufmode(struct venus_inst *inst);
void venus_helper_acquire_buf_ref(struct vb2_v4l2_buffer *vbuf);
void venus_helper_release_buf_ref(struct venus_inst *inst, unsigned int idx);
void venus_helper_init_instance(struct venus_inst *inst);

View File

@ -555,18 +555,9 @@ static int vdec_set_properties(struct venus_inst *inst)
return ret;
}
if (core->res->hfi_version == HFI_VERSION_3XX ||
inst->cap_bufs_mode_dynamic) {
struct hfi_buffer_alloc_mode mode;
ptype = HFI_PROPERTY_PARAM_BUFFER_ALLOC_MODE;
mode.type = HFI_BUFFER_OUTPUT;
mode.mode = HFI_BUFFER_MODE_DYNAMIC;
ret = hfi_session_set_property(inst, ptype, &mode);
ret = venus_helper_set_dyn_bufmode(inst);
if (ret)
return ret;
}
if (ctr->post_loop_deb_mode) {
ptype = HFI_PROPERTY_CONFIG_VDEC_POST_LOOP_DEBLOCKER;