leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

media: venus: helper: Decide work mode

Browse Source 
Decide work mode for encoder and decoder based on different
use-cases.

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:47 +02:00 committed by Mauro Carvalho Chehab
parent df67e35844
commit 1ad175952b
4 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/media/platform/qcom/venus/helpers.c
View File

@ -18,6 +18,9 @@
#include "hfi_platform.h" #include "hfi_platform.h"
#include "hfi_parser.h" #include "hfi_parser.h"
#define NUM_MBS_720P (((1280 + 15) >> 4) * ((720 + 15) >> 4))
#define NUM_MBS_4K (((4096 + 15) >> 4) * ((2304 + 15) >> 4))
struct intbuf { struct intbuf {
struct list_head list; struct list_head list;
u32 type; u32 type;
@ -1090,14 +1093,38 @@ int venus_helper_set_output_resolution(struct venus_inst *inst,
} }
EXPORT_SYMBOL_GPL(venus_helper_set_output_resolution); EXPORT_SYMBOL_GPL(venus_helper_set_output_resolution);
int venus_helper_set_work_mode(struct venus_inst *inst, u32 mode) static u32 venus_helper_get_work_mode(struct venus_inst *inst)
{
u32 mode;
u32 num_mbs;
mode = VIDC_WORK_MODE_2;
if (inst->session_type == VIDC_SESSION_TYPE_DEC) {
num_mbs = (ALIGN(inst->height, 16) * ALIGN(inst->width, 16)) / 256;
if (inst->hfi_codec == HFI_VIDEO_CODEC_MPEG2 ||
inst->pic_struct != HFI_INTERLACE_FRAME_PROGRESSIVE ||
num_mbs <= NUM_MBS_720P)
mode = VIDC_WORK_MODE_1;
} else {
num_mbs = (ALIGN(inst->out_height, 16) * ALIGN(inst->out_width, 16)) / 256;
if (inst->hfi_codec == HFI_VIDEO_CODEC_VP8 &&
num_mbs <= NUM_MBS_4K)
mode = VIDC_WORK_MODE_1;
}
return mode;
}
int venus_helper_set_work_mode(struct venus_inst *inst)
{ {
const u32 ptype = HFI_PROPERTY_PARAM_WORK_MODE; const u32 ptype = HFI_PROPERTY_PARAM_WORK_MODE;
struct hfi_video_work_mode wm; struct hfi_video_work_mode wm;
u32 mode;
if (!IS_V4(inst->core) && !IS_V6(inst->core)) if (!IS_V4(inst->core) && !IS_V6(inst->core))
return 0; return 0;
mode = venus_helper_get_work_mode(inst);
wm.video_work_mode = mode; wm.video_work_mode = mode;
return hfi_session_set_property(inst, ptype, &wm); return hfi_session_set_property(inst, ptype, &wm);
} }

2
drivers/media/platform/qcom/venus/helpers.h
View File

@ -32,7 +32,7 @@ int venus_helper_set_input_resolution(struct venus_inst *inst,
int venus_helper_set_output_resolution(struct venus_inst *inst, 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);
int venus_helper_set_format_constraints(struct venus_inst *inst); 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,

2
drivers/media/platform/qcom/venus/vdec.c
View File

@ -664,7 +664,7 @@ static int vdec_output_conf(struct venus_inst *inst)
u32 ptype; u32 ptype;
int ret; int ret;
ret = venus_helper_set_work_mode(inst, VIDC_WORK_MODE_2); ret = venus_helper_set_work_mode(inst);
if (ret) if (ret)
return ret; return ret;

2
drivers/media/platform/qcom/venus/venc.c
View File

@ -551,7 +551,7 @@ static int venc_set_properties(struct venus_inst *inst)
u32 profile, level; u32 profile, level;
int ret; int ret;
ret = venus_helper_set_work_mode(inst, VIDC_WORK_MODE_2); ret = venus_helper_set_work_mode(inst);
if (ret) if (ret)
return ret; return ret;