niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

media: venus: helpers, hfi, vdec: Set actual plane constraints to FW

Browse source 
Set actual plane alignments to FW with
HFI_PROPERTY_PARAM_UNCOMPRESSED_PLANE_ACTUAL_CONSTRAINTS_INFO to calculate
correct buffer size.

bod: Fixed fall-through error in pkt_session_set_property_6xx() switch
     Ensure setting format constraints on 6xx only

Signed-off-by: Dikshita Agarwal <dikshita@codeaurora.org>
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Dikshita Agarwal 2021-04-02 12:06:45 +02:00 • committed by Mauro Carvalho Chehab
parent c934d9d4ca
commit bc28936bbb
4 changed files with 42 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/media/platform/qcom/venus/helpers.c
View file

@ -1103,6 +1103,30 @@ int venus_helper_set_work_mode(struct venus_inst *inst, u32 mode)
} }
EXPORT_SYMBOL_GPL(venus_helper_set_work_mode); EXPORT_SYMBOL_GPL(venus_helper_set_work_mode);
int venus_helper_set_format_constraints(struct venus_inst *inst)
{
const u32 ptype = HFI_PROPERTY_PARAM_UNCOMPRESSED_PLANE_ACTUAL_CONSTRAINTS_INFO;
struct hfi_uncompressed_plane_actual_constraints_info pconstraint;
if (!IS_V6(inst->core))
return 0;
pconstraint.buffer_type = HFI_BUFFER_OUTPUT2;
pconstraint.num_planes = 2;
pconstraint.plane_format[0].stride_multiples = 128;
pconstraint.plane_format[0].max_stride = 8192;
pconstraint.plane_format[0].min_plane_buffer_height_multiple = 32;
pconstraint.plane_format[0].buffer_alignment = 256;
pconstraint.plane_format[1].stride_multiples = 128;
pconstraint.plane_format[1].max_stride = 8192;
pconstraint.plane_format[1].min_plane_buffer_height_multiple = 16;
pconstraint.plane_format[1].buffer_alignment = 256;
return hfi_session_set_property(inst, ptype, &pconstraint);
}
EXPORT_SYMBOL_GPL(venus_helper_set_format_constraints);
int venus_helper_set_num_bufs(struct venus_inst *inst, unsigned int input_bufs, int venus_helper_set_num_bufs(struct venus_inst *inst, unsigned int input_bufs,
unsigned int output_bufs, unsigned int output_bufs,
unsigned int output2_bufs) unsigned int output2_bufs)

1
drivers/media/platform/qcom/venus/helpers.h
View file

@ -33,6 +33,7 @@ int venus_helper_set_output_resolution(struct venus_inst *inst,
unsigned int width, unsigned int height, unsigned int width, unsigned int height,
u32 buftype); u32 buftype);
int venus_helper_set_work_mode(struct venus_inst *inst, u32 mode); int venus_helper_set_work_mode(struct venus_inst *inst, u32 mode);
int venus_helper_set_format_constraints(struct venus_inst *inst);
int venus_helper_set_num_bufs(struct venus_inst *inst, unsigned int input_bufs, int venus_helper_set_num_bufs(struct venus_inst *inst, unsigned int input_bufs,
unsigned int output_bufs, unsigned int output_bufs,
unsigned int output2_bufs); unsigned int output2_bufs);

13
drivers/media/platform/qcom/venus/hfi_cmds.c
View file

@ -1259,6 +1259,19 @@ pkt_session_set_property_6xx(struct hfi_session_set_property_pkt *pkt,
pkt->data[0] = ptype; pkt->data[0] = ptype;
switch (ptype) { switch (ptype) {
case HFI_PROPERTY_PARAM_UNCOMPRESSED_PLANE_ACTUAL_CONSTRAINTS_INFO: {
struct hfi_uncompressed_plane_actual_constraints_info *in = pdata;
struct hfi_uncompressed_plane_actual_constraints_info *info = prop_data;
info->buffer_type = in->buffer_type;
info->num_planes = in->num_planes;
info->plane_format[0] = in->plane_format[0];
if (in->num_planes > 1)
info->plane_format[1] = in->plane_format[1];
pkt->shdr.hdr.size += sizeof(u32) + sizeof(*info);
break;
}
case HFI_PROPERTY_CONFIG_HEIC_FRAME_QUALITY: { case HFI_PROPERTY_CONFIG_HEIC_FRAME_QUALITY: {
struct hfi_heic_frame_quality *in = pdata, *cq = prop_data; struct hfi_heic_frame_quality *in = pdata, *cq = prop_data;

4
drivers/media/platform/qcom/venus/vdec.c
View file

@ -715,6 +715,10 @@ static int vdec_output_conf(struct venus_inst *inst)
if (ret) if (ret)
return ret; return ret;
ret = venus_helper_set_format_constraints(inst);
if (ret)
return ret;
if (inst->dpb_fmt) { if (inst->dpb_fmt) {
ret = venus_helper_set_multistream(inst, false, true); ret = venus_helper_set_multistream(inst, false, true);
if (ret) if (ret)