lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msm: vidc: fix dpb buffer count validation

Browse Source 
Shouldn't use count_min to validate dpb buffer count, as it
has already been modified when received seq change event.
Use dpb buffer_count_actual instead.

Change-Id: Iad4117e4d0045859312d726caae1c8801ba1b897
Signed-off-by: Qiwei Liu <qiweil@codeaurora.org>
Signed-off-by: Govindaraj Rajagopal <grajagop@codeaurora.org>
This commit is contained in:
Govindaraj Rajagopal 2020-04-09 13:18:08 +08:00
parent 343e1966ff
commit 5b0dfe97c8
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
msm/vidc/msm_vidc_common.c
View File

@ -1911,9 +1911,19 @@ void msm_comm_validate_output_buffers(struct msm_vidc_inst *inst)
{
struct internal_buf *binfo;
u32 buffers_owned_by_driver = 0;
struct msm_vidc_format *fmt;
struct hal_buffer_requirements *dpb = NULL;
u32 i;
fmt = &inst->fmts[OUTPUT_PORT];
for (i = 0; i < HAL_BUFFER_MAX; i++) {
if (inst->buff_req.buffer[i].buffer_type == HAL_BUFFER_OUTPUT) {
dpb = &inst->buff_req.buffer[i];
break;
}
}
if (!dpb) {
s_vpr_e(inst->sid, "Couldn't retrieve dpb buf req\n");
return;
}
mutex_lock(&inst->outputbufs.lock);
if (list_empty(&inst->outputbufs.list)) {
@ -1932,11 +1942,10 @@ void msm_comm_validate_output_buffers(struct msm_vidc_inst *inst)
}
mutex_unlock(&inst->outputbufs.lock);
/* Only minimum number of DPBs are allocated */
if (buffers_owned_by_driver != fmt->count_min) {
s_vpr_e(inst->sid, "OUTPUT Buffer count mismatch %d of %d\n",
if (buffers_owned_by_driver != dpb->buffer_count_actual) {
s_vpr_e(inst->sid, "DPB buffer count mismatch %d of %d\n",
buffers_owned_by_driver,
fmt->count_min);
dpb->buffer_count_actual);
msm_vidc_handle_hw_error(inst->core);
}
}