samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

video: driver: Support max 1 enh HB layer when cvp is disabled

Browse Source 
Allow max 1 enh layers when cvp metadata is disabled for HB
layer type.

Change-Id: If6e33462e8be36a4ca1fb1f253875678b697c05a
Signed-off-by: Akshata Sahukar <asahukar@codeaurora.org>
This commit is contained in:
Akshata Sahukar
2021-05-11 12:55:45 -07:00
parent 849dab200f
commit 967d049715
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
driver/platform/waipio/src/msm_vidc_waipio.c
View File

@@ -727,7 +727,7 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
HFI_PROP_LAYER_COUNT, HFI_PROP_LAYER_COUNT,
CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT |
CAP_FLAG_DYNAMIC_ALLOWED, CAP_FLAG_DYNAMIC_ALLOWED,
{BITRATE_MODE}, {BITRATE_MODE, META_EVA_STATS},
{GOP_SIZE, B_FRAME, BIT_RATE}, {GOP_SIZE, B_FRAME, BIT_RATE},
msm_vidc_adjust_layer_count, msm_vidc_set_layer_count_and_type}, msm_vidc_adjust_layer_count, msm_vidc_set_layer_count_and_type},
@@ -737,7 +737,7 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
HFI_PROP_LAYER_COUNT, HFI_PROP_LAYER_COUNT,
CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT |
CAP_FLAG_DYNAMIC_ALLOWED, CAP_FLAG_DYNAMIC_ALLOWED,
{BITRATE_MODE}, {BITRATE_MODE, META_EVA_STATS},
{GOP_SIZE, B_FRAME, BIT_RATE}, {GOP_SIZE, B_FRAME, BIT_RATE},
msm_vidc_adjust_layer_count, msm_vidc_set_layer_count_and_type}, msm_vidc_adjust_layer_count, msm_vidc_set_layer_count_and_type},
@@ -1288,7 +1288,10 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
V4L2_MPEG_MSM_VIDC_DISABLE, V4L2_MPEG_MSM_VIDC_ENABLE, V4L2_MPEG_MSM_VIDC_DISABLE, V4L2_MPEG_MSM_VIDC_ENABLE,
1, V4L2_MPEG_MSM_VIDC_DISABLE, 1, V4L2_MPEG_MSM_VIDC_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_EVA_STATS, V4L2_CID_MPEG_VIDC_METADATA_EVA_STATS,
HFI_PROP_EVA_STAT_INFO}, HFI_PROP_EVA_STAT_INFO,
CAP_FLAG_ROOT,
{0},
{ENH_LAYER_COUNT}},
{META_BUF_TAG, DEC | ENC, CODECS_ALL, {META_BUF_TAG, DEC | ENC, CODECS_ALL,
V4L2_MPEG_MSM_VIDC_DISABLE, V4L2_MPEG_MSM_VIDC_ENABLE, V4L2_MPEG_MSM_VIDC_DISABLE, V4L2_MPEG_MSM_VIDC_ENABLE,

29
driver/vidc/src/msm_vidc_control.c
View File

@@ -268,7 +268,7 @@ static int msm_vidc_add_children(struct msm_vidc_inst *inst,
} }
static bool is_parent_available(struct msm_vidc_inst* inst, static bool is_parent_available(struct msm_vidc_inst* inst,
u32 cap, u32 check_parent) u32 cap, u32 check_parent, const char* func)
{ {
int i = 0; int i = 0;
u32 cap_parent; u32 cap_parent;
@@ -281,6 +281,10 @@ static bool is_parent_available(struct msm_vidc_inst* inst,
} }
i++; i++;
} }
i_vpr_e(inst,
"%s: missing parent %s for %s\n",
func, cap_name(check_parent), cap_name(cap));
return false; return false;
} }
@@ -308,7 +312,7 @@ static int msm_vidc_get_parent_value(struct msm_vidc_inst* inst,
{ {
int rc = 0; int rc = 0;
if (is_parent_available(inst, cap, parent)) { if (is_parent_available(inst, cap, parent, __func__)) {
switch (parent) { switch (parent) {
case BITRATE_MODE: case BITRATE_MODE:
*value = inst->hfi_rc_type; *value = inst->hfi_rc_type;
@@ -321,9 +325,6 @@ static int msm_vidc_get_parent_value(struct msm_vidc_inst* inst,
break; break;
} }
} else { } else {
i_vpr_e(inst,
"%s: missing parent %d for cap[%d] %s, fix database\n",
func, parent, cap, cap_name(cap));
rc = -EINVAL; rc = -EINVAL;
} }
@@ -1037,7 +1038,7 @@ int msm_vidc_adjust_ir_random(void *instance, struct v4l2_ctrl *ctrl)
* BITRATE_MODE dependency is NOT common across all chipsets. * BITRATE_MODE dependency is NOT common across all chipsets.
* Hence, do not return error if not specified as one of the parent. * Hence, do not return error if not specified as one of the parent.
*/ */
if (is_parent_available(inst, IR_RANDOM, BITRATE_MODE) && if (is_parent_available(inst, IR_RANDOM, BITRATE_MODE, __func__) &&
inst->hfi_rc_type != HFI_RC_CBR_CFR && inst->hfi_rc_type != HFI_RC_CBR_CFR &&
inst->hfi_rc_type != HFI_RC_CBR_VFR) inst->hfi_rc_type != HFI_RC_CBR_VFR)
adjusted_value = 0; adjusted_value = 0;
@@ -1265,6 +1266,14 @@ static int msm_vidc_adjust_static_layer_count_and_type(struct msm_vidc_inst *ins
goto exit; goto exit;
} }
if (!inst->capabilities->cap[META_EVA_STATS].value &&
hb_requested && (layer_count > 1)) {
layer_count = 1;
i_vpr_h(inst,
"%s: cvp disable supports only one enh layer HB\n",
__func__);
}
/* decide hfi layer type */ /* decide hfi layer type */
if (hb_requested) { if (hb_requested) {
inst->hfi_layer_type = HFI_HIER_B; inst->hfi_layer_type = HFI_HIER_B;
@@ -1316,11 +1325,11 @@ int msm_vidc_adjust_layer_count(void *instance, struct v4l2_ctrl *ctrl)
client_layer_count = ctrl ? ctrl->val : client_layer_count = ctrl ? ctrl->val :
capability->cap[ENH_LAYER_COUNT].value; capability->cap[ENH_LAYER_COUNT].value;
if (!is_parent_available(inst, ENH_LAYER_COUNT, BITRATE_MODE)) { if (!is_parent_available(inst, ENH_LAYER_COUNT,
i_vpr_e(inst, "%s: missing parent %d in database", BITRATE_MODE, __func__) ||
__func__, BITRATE_MODE); !is_parent_available(inst, ENH_LAYER_COUNT,
META_EVA_STATS, __func__))
return -EINVAL; return -EINVAL;
}
if (!inst->vb2q[OUTPUT_PORT].streaming) { if (!inst->vb2q[OUTPUT_PORT].streaming) {
rc = msm_vidc_adjust_static_layer_count_and_type(inst, rc = msm_vidc_adjust_static_layer_count_and_type(inst,