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

video: driver: release buffer fix

Browse Source 
when a buffer is asked for release and if the same buffer
is queued again before release done is received, then
second time the FTB should be queued without RO flag

Change-Id: I11c4494471129c5bb3ff4401ccfbd25c702c699d
Signed-off-by: Darshana Patil <quic_darshana@quicinc.com>
This commit is contained in:
Darshana Patil
2022-10-05 18:09:58 -07:00
parent a29437458a
commit a99d47f6a3
2 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
driver/vidc/src/msm_vdec.c
View File

@@ -1994,14 +1994,6 @@ int msm_vdec_qbuf(struct msm_vidc_inst *inst, struct vb2_buffer *vb2)
return -EINVAL;
}
if (vb2->type == OUTPUT_MPLANE) {
if (inst->capabilities->cap[DPB_LIST].value) {
rc = msm_vdec_release_nonref_buffers(inst);
if (rc)
return rc;
}
}
if (inst->adjust_priority) {
s32 priority = inst->capabilities->cap[PRIORITY].value;
@@ -2019,6 +2011,14 @@ int msm_vdec_qbuf(struct msm_vidc_inst *inst, struct vb2_buffer *vb2)
if (rc)
return rc;
if (vb2->type == OUTPUT_MPLANE) {
if (inst->capabilities->cap[DPB_LIST].value) {
rc = msm_vdec_release_nonref_buffers(inst);
if (rc)
return rc;
}
}
return rc;
}

35
driver/vidc/src/msm_vidc_driver.c
View File

@@ -2501,12 +2501,21 @@ int msm_vidc_process_readonly_buffers(struct msm_vidc_inst *inst,
/*
* check if read_only buffer is present in read_only list
* if present: add ro flag to buf
* if present: add ro flag to buf provided buffer is not
* pending release
*/
list_for_each_entry_safe(ro_buf, dummy, &inst->buffers.read_only.list, list) {
if (ro_buf->device_addr == buf->device_addr &&
ro_buf->attr & MSM_VIDC_ATTR_READ_ONLY) {
if (ro_buf->device_addr != buf->device_addr)
continue;
if (ro_buf->attr & MSM_VIDC_ATTR_READ_ONLY &&
!(ro_buf->attr & MSM_VIDC_ATTR_PENDING_RELEASE)) {
/* add READ_ONLY to the buffer going to the firmware */
buf->attr |= MSM_VIDC_ATTR_READ_ONLY;
/*
* remove READ_ONLY on the read_only list buffer so that
* it will get removed from the read_only list below
*/
ro_buf->attr &= ~MSM_VIDC_ATTR_READ_ONLY;
break;
}
}
@@ -2516,13 +2525,21 @@ int msm_vidc_process_readonly_buffers(struct msm_vidc_inst *inst,
/* if read only buffer do not remove */
if (ro_buf->attr & MSM_VIDC_ATTR_READ_ONLY)
continue;
/* if v4l2 did not ask for unmap/detach then do not remove */
if (!ro_buf->sg_table || !ro_buf->attach || !ro_buf->dbuf_get)
continue;
print_vidc_buffer(VIDC_LOW, "low ", "ro buf removed", inst, ro_buf);
msm_vidc_dma_buf_unmap_attachment(ro_buf->attach, ro_buf->sg_table);
msm_vidc_dma_buf_detach(ro_buf->dmabuf, ro_buf->attach);
msm_vidc_memory_put_dmabuf(inst, ro_buf->dmabuf);
/* unmap the buffer if driver holds mapping */
if (ro_buf->sg_table && ro_buf->attach) {
msm_vidc_dma_buf_unmap_attachment(ro_buf->attach, ro_buf->sg_table);
msm_vidc_dma_buf_detach(ro_buf->dmabuf, ro_buf->attach);
ro_buf->dmabuf = NULL;
ro_buf->attach = NULL;
}
if (ro_buf->dbuf_get) {
msm_vidc_memory_put_dmabuf(inst, ro_buf->dmabuf);
ro_buf->dmabuf = NULL;
ro_buf->dbuf_get = 0;
}
list_del_init(&ro_buf->list);
msm_memory_pool_free(inst, ro_buf);
}