diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-05-17 12:23:36 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-05-17 12:23:36 -0700 |
| commit | 3a9f9cc5918e4e12ac28c01faa4ecba9a54609fb (patch) | |
| tree | b48bb2ca675829161a316caa2eb09c4a9f1c628a | |
| parent | c3b0ba5ee3aaafe4a6cb95a3929ab0c697b36ac6 (diff) | |
| parent | e9d6a3f0a7e45c63b81ec0fe64eed4d5aacbe22b (diff) | |
Merge "msm: mdss: Increase fbmem buf ref count before use in mdp3"
| -rw-r--r-- | drivers/video/fbdev/msm/mdp3_ctrl.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/video/fbdev/msm/mdp3_ctrl.c b/drivers/video/fbdev/msm/mdp3_ctrl.c index dff8b63eea64..8a9e8acf6c0e 100644 --- a/drivers/video/fbdev/msm/mdp3_ctrl.c +++ b/drivers/video/fbdev/msm/mdp3_ctrl.c @@ -1564,12 +1564,15 @@ static int mdp3_get_metadata(struct msm_fb_data_type *mfd, break; case metadata_op_get_ion_fd: if (mfd->fb_ion_handle && mfd->fb_ion_client) { + get_dma_buf(mfd->fbmem_buf); metadata->data.fbmem_ionfd = ion_share_dma_buf_fd(mfd->fb_ion_client, 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", - metadata->data.fbmem_ionfd); + metadata->data.fbmem_ionfd); + } } break; default: |