samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
派生 0
代码 工单 合并请求 工作流 软件包 项目 发布 百科 活动

video: driver: amend V4L2_BUF_FLAG_ERROR flag handling

浏览代码 
amend MSM_VIDC_BUF_FLAG_ERROR driver EBD/FBD buffer flag
handling to properly pass V4L2_BUF_FLAG_ERROR to client.

Change-Id: I9de1af3a2b5026e6d281982048f2e7f172221695
Signed-off-by: Akshata Sahukar <asahukar@codeaurora.org>
这个提交包含在：
Akshata Sahukar
2021-02-10 13:48:37 -08:00
父节点 3b845bc495
当前提交 f451c19147
共修改 3 个文件，包含 38 行新增和 24 行删除
下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

2
driver/vidc/inc/msm_vidc_inst.h
查看文件

@@ -118,7 +118,7 @@ struct msm_vidc_inst {
bool subscribed_input_prop;
bool subscribed_output_prop;
struct msm_vidc_subscription_params subcr_params[MAX_PORT];
struct msm_vidc_frame_properties frame_prop;
struct msm_vidc_hfi_frame_info hfi_frame_info;
struct msm_vidc_decode_batch decode_batch;
struct msm_vidc_decode_vpp_delay decode_vpp_delay;
struct msm_vidc_session_idle session_idle;

11
driver/vidc/inc/msm_vidc_internal.h
查看文件

@@ -604,11 +604,12 @@ struct msm_vidc_subscription_params {
u32 tier;
};
struct msm_vidc_frame_properties {
u32 hfi_picture_type;
u32 hfi_no_output;
u32 hfi_cr;
u32 hfi_cf;
struct msm_vidc_hfi_frame_info {
u32 picture_type;
u32 no_output;
u32 cr;
u32 cf;
u32 data_corrupt;
};
struct msm_vidc_cmd_range {

49
driver/vidc/src/venus_hfi_response.c
查看文件

@@ -211,6 +211,7 @@ static int handle_session_info(struct msm_vidc_inst *inst,
break;
case HFI_INFO_DATA_CORRUPT:
info = "data corrupt";
inst->hfi_frame_info.data_corrupt = 1;
break;
default:
info = "unknown";
@@ -392,23 +393,26 @@ static int get_driver_buffer_flags(struct msm_vidc_inst *inst, u32 hfi_flags)
{
u32 driver_flags = 0;
if (inst->frame_prop.hfi_picture_type & HFI_PICTURE_IDR) {
if (inst->hfi_frame_info.picture_type & HFI_PICTURE_IDR) {
driver_flags |= MSM_VIDC_BUF_FLAG_KEYFRAME;
} else if (inst->frame_prop.hfi_picture_type & HFI_PICTURE_P) {
} else if (inst->hfi_frame_info.picture_type & HFI_PICTURE_P) {
driver_flags |= MSM_VIDC_BUF_FLAG_PFRAME;
} else if (inst->frame_prop.hfi_picture_type & HFI_PICTURE_B) {
} else if (inst->hfi_frame_info.picture_type & HFI_PICTURE_B) {
driver_flags |= MSM_VIDC_BUF_FLAG_BFRAME;
} else if (inst->frame_prop.hfi_picture_type & HFI_PICTURE_I) {
} else if (inst->hfi_frame_info.picture_type & HFI_PICTURE_I) {
if (inst->codec == MSM_VIDC_VP9)
driver_flags |= MSM_VIDC_BUF_FLAG_KEYFRAME;
} else if (inst->frame_prop.hfi_picture_type & HFI_PICTURE_CRA) {
} else if (inst->hfi_frame_info.picture_type & HFI_PICTURE_CRA) {
driver_flags |= MSM_VIDC_BUF_FLAG_KEYFRAME;
} else if (inst->frame_prop.hfi_picture_type & HFI_PICTURE_BLA) {
} else if (inst->hfi_frame_info.picture_type & HFI_PICTURE_BLA) {
driver_flags |= MSM_VIDC_BUF_FLAG_KEYFRAME;
}
if (inst->capabilities->cap[META_BUF_TAG].value) {
if (inst->frame_prop.hfi_no_output &&
if (inst->hfi_frame_info.data_corrupt)
driver_flags |= MSM_VIDC_BUF_FLAG_ERROR;
if (inst->hfi_frame_info.no_output) {
if (inst->capabilities->cap[META_BUF_TAG].value &&
!(hfi_flags & HFI_BUF_FW_FLAG_CODEC_CONFIG))
driver_flags |= MSM_VIDC_BUF_FLAG_ERROR;
}
@@ -490,6 +494,15 @@ static int handle_output_buffer(struct msm_vidc_inst *inst,
buf->attr &= ~MSM_VIDC_ATTR_QUEUED;
buf->attr |= MSM_VIDC_ATTR_DEQUEUED;
if (is_encode_session(inst)) {
/* encoder output is not expected to be corrupted */
if (inst->hfi_frame_info.data_corrupt) {
i_vpr_e(inst, "%s: encode output is corrupted\n", __func__);
msm_vidc_change_inst_state(inst, MSM_VIDC_ERROR, __func__);
}
}
/*
* reset data size to zero for last flag buffer.
* reset RO flag for last flag buffer.
@@ -1068,7 +1081,7 @@ static int handle_session_property(struct msm_vidc_inst *inst,
__func__, pkt->port, pkt->type);
break;
}
inst->frame_prop.hfi_picture_type = payload_ptr[0];
inst->hfi_frame_info.picture_type = payload_ptr[0];
break;
case HFI_PROP_NO_OUTPUT:
if (port != INPUT_PORT) {
@@ -1078,7 +1091,7 @@ static int handle_session_property(struct msm_vidc_inst *inst,
__func__, pkt->port, pkt->type);
break;
}
inst->frame_prop.hfi_no_output = 1;
inst->hfi_frame_info.no_output = 1;
break;
default:
i_vpr_e(inst, "%s: invalid port settings property %#x\n",
@@ -1217,9 +1230,9 @@ int handle_session_response_work(struct msm_vidc_inst *inst,
struct msm_vidc_cmd_range be[5] = {
{HFI_SYSTEM_ERROR_BEGIN, HFI_SYSTEM_ERROR_END},
{HFI_SESSION_ERROR_BEGIN, HFI_SESSION_ERROR_END},
{HFI_INFORMATION_BEGIN, HFI_INFORMATION_END},
{HFI_PROP_BEGIN, HFI_PROP_END},
{HFI_CMD_BEGIN, HFI_CMD_END},
{HFI_INFORMATION_BEGIN, HFI_INFORMATION_END},
};
if (!inst || !resp_work) {
@@ -1248,8 +1261,8 @@ int handle_session_response_work(struct msm_vidc_inst *inst,
pkt += packet->size;
}
memset(&inst->frame_prop, 0,
sizeof(struct msm_vidc_frame_properties));
memset(&inst->hfi_frame_info, 0,
sizeof(struct msm_vidc_hfi_frame_info));
for (i = 0; i < ARRAY_SIZE(be); i++) {
pkt = start_pkt;
for (j = 0; j < hdr->num_packets; j++) {
@@ -1277,8 +1290,8 @@ int handle_session_response_work(struct msm_vidc_inst *inst,
goto exit;
}
memset(&inst->frame_prop, 0,
sizeof(struct msm_vidc_frame_properties));
memset(&inst->hfi_frame_info, 0,
sizeof(struct msm_vidc_hfi_frame_info));
exit:
return rc;
@@ -1384,9 +1397,9 @@ static int handle_session_response(struct msm_vidc_core *core,
struct msm_vidc_cmd_range be[5] = {
{HFI_SYSTEM_ERROR_BEGIN, HFI_SYSTEM_ERROR_END},
{HFI_SESSION_ERROR_BEGIN, HFI_SESSION_ERROR_END},
{HFI_INFORMATION_BEGIN, HFI_INFORMATION_END},
{HFI_PROP_BEGIN, HFI_PROP_END},
{HFI_CMD_BEGIN, HFI_CMD_END},
{HFI_INFORMATION_BEGIN, HFI_INFORMATION_END},
};
inst = get_inst(core, hdr->session_id);
@@ -1436,7 +1449,7 @@ static int handle_session_response(struct msm_vidc_core *core,
pkt += packet->size;
}
memset(&inst->frame_prop, 0, sizeof(struct msm_vidc_frame_properties));
memset(&inst->hfi_frame_info, 0, sizeof(struct msm_vidc_hfi_frame_info));
for (i = 0; i < ARRAY_SIZE(be); i++) {
pkt = start_pkt;
for (j = 0; j < hdr->num_packets; j++) {
@@ -1457,7 +1470,7 @@ static int handle_session_response(struct msm_vidc_core *core,
goto exit;
}
memset(&inst->frame_prop, 0, sizeof(struct msm_vidc_frame_properties));
memset(&inst->hfi_frame_info, 0, sizeof(struct msm_vidc_hfi_frame_info));
exit:
mutex_unlock(&inst->lock);