samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Derivar 0
Código Questões Pedidos de integração Operações Pacotes Planeamentos Lançamentos Wiki Trabalho

video: driver: Remove inst check in video driver

Ver a proveniência 
Remove inst check from all the functions in video driver.
Inst check is present in most of the functions in video
driver which is not required.
Keep check only at root level functions and remove
from rest all of the functions.

Change-Id: Ib310cd3df5e8612a9fc3a5aa654dff4203a12906
Signed-off-by: Vedang Nagar <quic_vnagar@quicinc.com>
Este cometimento está contido em:
Vedang Nagar
2023-05-16 17:33:36 +05:30
ascendente ad201f4176
cometimento e2663ce820
32 ficheiros modificados com 205 adições e 2376 eliminações
Descarregar ficheiro patch Descarregar ficheiro diff Expandir todos os ficheiros Colapsar todos os ficheiros

79
driver/variant/iris2/src/msm_vidc_buffer_iris2.c
Ver ficheiro

@@ -24,10 +24,6 @@ static u32 msm_vidc_decoder_bin_size_iris2(struct msm_vidc_inst *inst)
bool is_interlaced;
u32 vpp_delay;
if (!inst || !inst->core) {
d_vpr_e("%s: invalid params\n", __func__);
return size;
}
core = inst->core;
num_vpp_pipes = core->capabilities[NUM_VPP_PIPE].value;
@@ -64,11 +60,6 @@ static u32 msm_vidc_decoder_comv_size_iris2(struct msm_vidc_inst* inst)
u32 width, height, out_min_count, vpp_delay;
struct v4l2_format* f;
if (!inst || !inst->core) {
d_vpr_e("%s: invalid params\n", __func__);
return size;
}
f = &inst->fmts[INPUT_PORT];
width = f->fmt.pix_mp.width;
height = f->fmt.pix_mp.height;
@@ -95,10 +86,6 @@ static u32 msm_vidc_decoder_non_comv_size_iris2(struct msm_vidc_inst* inst)
struct msm_vidc_core* core;
struct v4l2_format* f;
if (!inst || !inst->core) {
d_vpr_e("%s: invalid params\n", __func__);
return size;
}
core = inst->core;
num_vpp_pipes = core->capabilities[NUM_VPP_PIPE].value;
@@ -125,10 +112,6 @@ static u32 msm_vidc_decoder_line_size_iris2(struct msm_vidc_inst *inst)
bool is_opb;
u32 color_fmt;
if (!inst || !inst->core) {
d_vpr_e("%s: invalid params\n", __func__);
return size;
}
core = inst->core;
num_vpp_pipes = core->capabilities[NUM_VPP_PIPE].value;
@@ -174,11 +157,6 @@ static u32 msm_vidc_decoder_persist_size_iris2(struct msm_vidc_inst *inst)
u32 size = 0;
u32 rpu_enabled = 0;
if (!inst) {
d_vpr_e("%s: invalid params\n", __func__);
return size;
}
if (inst->capabilities[META_DOLBY_RPU].value)
rpu_enabled = 1;
@@ -199,11 +177,6 @@ static u32 msm_vidc_decoder_dpb_size_iris2(struct msm_vidc_inst *inst)
u32 color_fmt, width, height, size = 0;
struct v4l2_format *f;
if (!inst) {
d_vpr_e("%s: invalid params\n", __func__);
return size;
}
color_fmt = inst->capabilities[PIX_FMTS].value;
if (!is_linear_colorformat(color_fmt))
return size;
@@ -248,10 +221,6 @@ static u32 msm_vidc_encoder_bin_size_iris2(struct msm_vidc_inst *inst)
u32 width, height, num_vpp_pipes, stage;
struct v4l2_format *f;
if (!inst || !inst->core) {
d_vpr_e("%s: invalid params\n", __func__);
return size;
}
core = inst->core;
num_vpp_pipes = core->capabilities[NUM_VPP_PIPE].value;
@@ -306,11 +275,6 @@ static u32 msm_vidc_encoder_comv_size_iris2(struct msm_vidc_inst* inst)
u32 width, height, num_recon = 0;
struct v4l2_format* f;
if (!inst || !inst->core) {
d_vpr_e("%s: invalid params\n", __func__);
return size;
}
f = &inst->fmts[OUTPUT_PORT];
width = f->fmt.pix_mp.width;
height = f->fmt.pix_mp.height;
@@ -332,10 +296,6 @@ static u32 msm_vidc_encoder_non_comv_size_iris2(struct msm_vidc_inst* inst)
u32 width, height, num_vpp_pipes;
struct v4l2_format* f;
if (!inst || !inst->core) {
d_vpr_e("%s: invalid params\n", __func__);
return size;
}
core = inst->core;
num_vpp_pipes = core->capabilities[NUM_VPP_PIPE].value;
@@ -360,10 +320,6 @@ static u32 msm_vidc_encoder_line_size_iris2(struct msm_vidc_inst *inst)
bool is_tenbit = false;
struct v4l2_format *f;
if (!inst || !inst->core) {
d_vpr_e("%s: invalid params\n", __func__);
return size;
}
core = inst->core;
num_vpp_pipes = core->capabilities[NUM_VPP_PIPE].value;
@@ -390,11 +346,6 @@ static u32 msm_vidc_encoder_dpb_size_iris2(struct msm_vidc_inst *inst)
struct v4l2_format *f;
bool is_tenbit;
if (!inst || !inst->core) {
d_vpr_e("%s: invalid params\n", __func__);
return 0;
}
f = &inst->fmts[OUTPUT_PORT];
width = f->fmt.pix_mp.width;
height = f->fmt.pix_mp.height;
@@ -415,11 +366,6 @@ static u32 msm_vidc_encoder_arp_size_iris2(struct msm_vidc_inst *inst)
{
u32 size = 0;
if (!inst || !inst->core) {
d_vpr_e("%s: invalid params\n", __func__);
return 0;
}
HFI_BUFFER_ARP_ENC(size);
i_vpr_l(inst, "%s: size %d\n", __func__, size);
return size;
@@ -433,11 +379,6 @@ static u32 msm_vidc_encoder_vpss_size_iris2(struct msm_vidc_inst* inst)
u32 width, height, driver_colorfmt;
struct v4l2_format* f;
if (!inst || !inst->core) {
d_vpr_e("%s: invalid params\n", __func__);
return 0;
}
ds_enable = is_scaling_enabled(inst);
msm_vidc_v4l2_to_hfi_enum(inst, ROTATION, &rotation_val);
@@ -543,11 +484,6 @@ static int msm_vidc_input_min_count_iris2(struct msm_vidc_inst* inst)
u32 input_min_count = 0;
u32 total_hb_layer = 0;
if (!inst) {
d_vpr_e("%s: invalid params\n", __func__);
return 0;
}
if (is_decode_session(inst)) {
input_min_count = MIN_DEC_INPUT_BUFFERS;
} else if (is_encode_session(inst)) {
@@ -575,11 +511,6 @@ static int msm_buffer_dpb_count(struct msm_vidc_inst *inst)
int count = 0;
u32 color_fmt;
if (!inst) {
d_vpr_e("%s: invalid params\n", __func__);
return 0;
}
/* decoder dpb buffer count */
if (is_decode_session(inst)) {
color_fmt = inst->capabilities[PIX_FMTS].value;
@@ -598,11 +529,6 @@ int msm_buffer_min_count_iris2(struct msm_vidc_inst *inst,
{
int count = 0;
if (!inst) {
d_vpr_e("%s: invalid params\n", __func__);
return 0;
}
switch (buffer_type) {
case MSM_VIDC_BUF_INPUT:
case MSM_VIDC_BUF_INPUT_META:
@@ -637,11 +563,6 @@ int msm_buffer_extra_count_iris2(struct msm_vidc_inst *inst,
{
int count = 0;
if (!inst) {
d_vpr_e("%s: invalid params\n", __func__);
return 0;
}
switch (buffer_type) {
case MSM_VIDC_BUF_INPUT:
case MSM_VIDC_BUF_INPUT_META:

20
driver/variant/iris2/src/msm_vidc_iris2.c
Ver ficheiro

@@ -815,11 +815,6 @@ int msm_vidc_decide_work_mode_iris2(struct msm_vidc_inst* inst)
u32 width, height;
bool res_ok = false;
if (!inst) {
d_vpr_e("%s: invalid params\n", __func__);
return -EINVAL;
}
work_mode = MSM_VIDC_STAGE_2;
inp_f = &inst->fmts[INPUT_PORT];
@@ -871,11 +866,6 @@ int msm_vidc_decide_work_route_iris2(struct msm_vidc_inst* inst)
u32 work_route;
struct msm_vidc_core* core;
if (!inst || !inst->core) {
d_vpr_e("%s: invalid params\n", __func__);
return -EINVAL;
}
core = inst->core;
work_route = core->capabilities[NUM_VPP_PIPE].value;
@@ -914,11 +904,6 @@ int msm_vidc_adjust_blur_type_iris2(void *instance, struct v4l2_ctrl *ctrl)
s32 rc_type = -1, cac = -1;
s32 pix_fmts = -1, min_quality = -1;
if (!inst) {
d_vpr_e("%s: invalid params\n", __func__);
return -EINVAL;
}
adjusted_value = ctrl ? ctrl->val :
inst->capabilities[BLUR_TYPES].value;
@@ -960,11 +945,6 @@ int msm_vidc_decide_quality_mode_iris2(struct msm_vidc_inst* inst)
u32 mbpf, mbps, max_hq_mbpf, max_hq_mbps;
u32 mode = MSM_VIDC_POWER_SAVE_MODE;
if (!inst) {
d_vpr_e("%s: invalid params\n", __func__);
return -EINVAL;
}
if (!is_encode_session(inst))
return 0;

9
driver/variant/iris2/src/msm_vidc_power_iris2.c
Ver ficheiro

@@ -22,16 +22,7 @@ u64 msm_vidc_calc_freq_iris2(struct msm_vidc_inst *inst, u32 data_size)
u32 base_cycles = 0;
u32 fps, mbpf;
if (!inst || !inst->core) {
d_vpr_e("%s: invalid params\n", __func__);
return freq;
}
core = inst->core;
if (!core->resource) {
d_vpr_e("%s: invalid params\n", __func__);
return freq;
}
mbpf = msm_vidc_get_mbs_per_frame(inst);
fps = inst->max_rate;