From b2edddb0e7b5d1763a588a0e97faa1ecb3f7866d Mon Sep 17 00:00:00 2001 From: Sachin Bhayare Date: Tue, 3 Apr 2018 20:09:12 +0530 Subject: [PATCH] msm: Allocate fd with O_CLOEXEC flag (cherry-pick from 'commit 580ec70acac4 ("fbdev: msm: Allocate fd with O_CLOEXEC flag")') and made similar changes for MDP3. When fd is requested during get_metadata call, create fd using O_CLOEXEC flag. Change-Id: Iaa55927ac04b019ea45fbdfe9c64b10d1f0e3ceb Signed-off-by: Nirmal Abraham Signed-off-by: Sachin Bhayare --- drivers/video/fbdev/msm/mdp3_ctrl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/video/fbdev/msm/mdp3_ctrl.c b/drivers/video/fbdev/msm/mdp3_ctrl.c index d357a616b05e..dff8b63eea64 100644 --- a/drivers/video/fbdev/msm/mdp3_ctrl.c +++ b/drivers/video/fbdev/msm/mdp3_ctrl.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved. +/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -1563,9 +1563,10 @@ static int mdp3_get_metadata(struct msm_fb_data_type *mfd, } break; case metadata_op_get_ion_fd: - if (mfd->fb_ion_handle) { + if (mfd->fb_ion_handle && mfd->fb_ion_client) { metadata->data.fbmem_ionfd = - dma_buf_fd(mfd->fbmem_buf, 0); + ion_share_dma_buf_fd(mfd->fb_ion_client, + mfd->fb_ion_handle); if (metadata->data.fbmem_ionfd < 0) pr_err("fd allocation failed. fd = %d\n", metadata->data.fbmem_ionfd);