Skip to content

fix core dump issue #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
renjiang-qti wants to merge 1 commit into
base: video.qclinux.main
Choose a base branch
from
Open

fix core dump issue #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions driver/vidc/src/msm_vidc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,6 +961,12 @@ int msm_vidc_close(struct msm_vidc_inst *inst, struct file *filp)
/* print internal buffer memory usage stats */
msm_vidc_print_memory_stats(inst);
msm_vidc_print_residency_stats(core);
/*
* vb2_queue_deinit() must happen before session close so that
* venus_hfi_stop() (called from stop_streaming vb2 callback)
* can succeed with a valid inst->packet.
*/
msm_vidc_vb2_queue_deinit(inst);
msm_vidc_session_close(inst);
msm_vidc_change_state(inst, MSM_VIDC_CLOSE, __func__);
inst->sub_state = MSM_VIDC_SUB_STATE_NONE;
Expand Down
3 changes: 1 addition & 2 deletions driver/vidc/src/msm_vidc_driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ void print_vidc_buffer(u32 tag, const char *tag_str, const char *str, struct msm
return;

dbuf = (struct dma_buf *)vbuf->dmabuf;
if (dbuf && dbuf->file) {
if (dbuf && vbuf->dbuf_get && dbuf->file) {
f_inode = file_inode(dbuf->file);
if (f_inode) {
inode_num = f_inode->i_ino;
Expand Down Expand Up @@ -5477,7 +5477,6 @@ static void msm_vidc_close_helper(struct kref *kref)
* So acquire lock before calling vb2q_deinit.
*/
inst_lock(inst, __func__);
msm_vidc_vb2_queue_deinit(inst);
msm_vidc_v4l2_fh_deinit(inst);
inst_unlock(inst, __func__);
destroy_workqueue(inst->workq);
Expand Down