evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: mdss: Increase fbmem buf ref count before use in mdp3"

Browse source
This commit is contained in:
Linux Build Service Account 2018-05-17 12:23:36 -07:00 • committed by Gerrit - the friendly Code Review server
commit 3a9f9cc591
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/video/fbdev/msm/mdp3_ctrl.c
View file

@ -1564,13 +1564,16 @@ static int mdp3_get_metadata(struct msm_fb_data_type *mfd,
break; break;
case metadata_op_get_ion_fd: case metadata_op_get_ion_fd:
if (mfd->fb_ion_handle && mfd->fb_ion_client) { if (mfd->fb_ion_handle && mfd->fb_ion_client) {
get_dma_buf(mfd->fbmem_buf);
metadata->data.fbmem_ionfd = metadata->data.fbmem_ionfd =
ion_share_dma_buf_fd(mfd->fb_ion_client, ion_share_dma_buf_fd(mfd->fb_ion_client,
mfd->fb_ion_handle); mfd->fb_ion_handle);
if (metadata->data.fbmem_ionfd < 0) if (metadata->data.fbmem_ionfd < 0) {
dma_buf_put(mfd->fbmem_buf);
pr_err("fd allocation failed. fd = %d\n", pr_err("fd allocation failed. fd = %d\n",
metadata->data.fbmem_ionfd); metadata->data.fbmem_ionfd);
} }
}
break; break;
default: default:
pr_warn("Unsupported request to MDP GET META IOCTL.\n"); pr_warn("Unsupported request to MDP GET META IOCTL.\n");