samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
複製 0
程式碼 問題管理 合併請求 Actions Packages Projects 版本發佈 Wiki Activity

Merge "video: driver: remove core capability pointer"

瀏覽代碼
This commit is contained in:
qctecmdr
2023-04-07 09:22:36 -07:00
committed by Gerrit - the friendly Code Review server
父節點 9c1c73f705 6bdbae50f2
當前提交 005d5f44ef
共有 18 個文件被更改，包括 29 次插入 和 152 次删除
Download Patch File Download Diff File Expand all files Collapse all files

27
driver/variant/iris33/src/msm_vidc_buffer_iris33.c
查看文件

@@ -30,10 +30,6 @@ static u32 msm_vidc_decoder_bin_size_iris33(struct msm_vidc_inst *inst)
}
core = inst->core;
if (!core->capabilities) {
i_vpr_e(inst, "%s: invalid capabilities\n", __func__);
return size;
}
num_vpp_pipes = core->capabilities[NUM_VPP_PIPE].value;
if (inst->decode_vpp_delay.enable)
vpp_delay = inst->decode_vpp_delay.size;
@@ -133,10 +129,7 @@ static u32 msm_vidc_decoder_non_comv_size_iris33(struct msm_vidc_inst* inst)
return size;
}
core = inst->core;
if (!core->capabilities) {
i_vpr_e(inst, "%s: invalid core capabilities\n", __func__);
return size;
}
num_vpp_pipes = core->capabilities[NUM_VPP_PIPE].value;
f = &inst->fmts[INPUT_PORT];
@@ -166,10 +159,6 @@ static u32 msm_vidc_decoder_line_size_iris33(struct msm_vidc_inst *inst)
return size;
}
core = inst->core;
if (!core->capabilities) {
i_vpr_e(inst, "%s: invalid capabilities\n", __func__);
return size;
}
num_vpp_pipes = core->capabilities[NUM_VPP_PIPE].value;
color_fmt = v4l2_colorformat_to_driver(inst,
@@ -346,10 +335,7 @@ static u32 msm_vidc_encoder_bin_size_iris33(struct msm_vidc_inst *inst)
return size;
}
core = inst->core;
if (!core->capabilities) {
i_vpr_e(inst, "%s: invalid core capabilities\n", __func__);
return size;
}
num_vpp_pipes = core->capabilities[NUM_VPP_PIPE].value;
stage = inst->capabilities[STAGE].value;
f = &inst->fmts[OUTPUT_PORT];
@@ -435,10 +421,7 @@ static u32 msm_vidc_encoder_non_comv_size_iris33(struct msm_vidc_inst* inst)
return size;
}
core = inst->core;
if (!core->capabilities) {
i_vpr_e(inst, "%s: invalid core capabilities\n", __func__);
return size;
}
num_vpp_pipes = core->capabilities[NUM_VPP_PIPE].value;
f = &inst->fmts[OUTPUT_PORT];
width = f->fmt.pix_mp.width;
@@ -466,10 +449,6 @@ static u32 msm_vidc_encoder_line_size_iris33(struct msm_vidc_inst *inst)
return size;
}
core = inst->core;
if (!core->capabilities) {
i_vpr_e(inst, "%s: invalid capabilities\n", __func__);
return size;
}
num_vpp_pipes = core->capabilities[NUM_VPP_PIPE].value;
pixfmt = inst->capabilities[PIX_FMTS].value;

2
driver/variant/iris33/src/msm_vidc_iris33.c
查看文件

@@ -571,7 +571,7 @@ static int __power_off_iris33(struct msm_vidc_core *core)
{
int rc = 0;
if (!core || !core->capabilities) {
if (!core) {
d_vpr_e("%s: invalid params\n", __func__);
return -EINVAL;
}