2019-03-29 14:12:17 +08:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2019-01-29 07:43:42 +08:00
|
|
|
From: Meng Wei <wei.meng@intel.com>
|
|
|
|
|
Date: Mon, 14 Jan 2019 10:29:09 +0800
|
2019-03-29 14:12:17 +08:00
|
|
|
Subject: [PATCH] media: intel-ipu4: [VIRT] Avoid double close of dmabuf FD.
|
2019-01-29 07:43:42 +08:00
|
|
|
|
|
|
|
|
This patch is to fix the ksys_close call for
|
|
|
|
|
camera streaming for SOS case where the dmabuf fd
|
|
|
|
|
is close by user space. Added check to only close
|
|
|
|
|
the dmabuf fd for virtualized case.
|
|
|
|
|
|
|
|
|
|
Change-Id: Id0c7fbdc8b81235c36f0340501a8c695ec3aaacf
|
|
|
|
|
Tracked-On: PKT-1691
|
|
|
|
|
Signed-off-by: Ong Hock Yu <ong.hock.yu@intel.com>
|
|
|
|
|
Signed-off-by: Meng Wei <wei.meng@intel.com>
|
|
|
|
|
---
|
|
|
|
|
drivers/media/pci/intel/ipu-psys.c | 3 ---
|
|
|
|
|
1 file changed, 3 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/drivers/media/pci/intel/ipu-psys.c b/drivers/media/pci/intel/ipu-psys.c
|
2020-10-27 02:14:06 +08:00
|
|
|
index de69adb470c3..345285caaa99 100644
|
2019-01-29 07:43:42 +08:00
|
|
|
--- a/drivers/media/pci/intel/ipu-psys.c
|
|
|
|
|
+++ b/drivers/media/pci/intel/ipu-psys.c
|
|
|
|
|
@@ -543,9 +543,6 @@ static int ipu_psys_release(struct inode *inode, struct file *file)
|
|
|
|
|
kbuf->dbuf = NULL;
|
|
|
|
|
kbuf->db_attach = NULL;
|
|
|
|
|
dma_buf_put(dbuf);
|
|
|
|
|
-#if defined(CONFIG_VIDEO_INTEL_IPU_ACRN) && defined(CONFIG_VIDEO_INTEL_IPU_VIRTIO_BE)
|
|
|
|
|
- ksys_close(kbuf->fd);
|
|
|
|
|
-#endif
|
|
|
|
|
} else {
|
|
|
|
|
if (kbuf->db_attach)
|
|
|
|
|
ipu_psys_put_userpages(
|
|
|
|
|
--
|
2019-04-08 18:08:36 +08:00
|
|
|
https://clearlinux.org
|
2019-01-29 07:43:42 +08:00
|
|
|
|
