From 8c12b4d429f984d846b68b39aa215cf2f4df1636 Mon Sep 17 00:00:00 2001 From: LinJinfa Date: Wed, 11 May 2016 10:33:49 +0000 Subject: [PATCH] Ignore iommu judgement for all the address using fd + offset mode despite vpu memory allocate with CMA or VMALLOC heaps. git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@723 6e48237b-75ef-9749-8fc9-41990f28c85a --- mpp/hal/worker/libvpu/vpu.c | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/mpp/hal/worker/libvpu/vpu.c b/mpp/hal/worker/libvpu/vpu.c index 78a3406b..f35b1620 100644 --- a/mpp/hal/worker/libvpu/vpu.c +++ b/mpp/hal/worker/libvpu/vpu.c @@ -229,26 +229,7 @@ static RK_S32 check_sysfs_iommu() RK_S32 VPUClientGetIOMMUStatus() { - int ret = 0; - if (vpu_service_iommu_status < 0) { - vpu_service_iommu_status = check_sysfs_iommu(); - if (vpu_service_iommu_status < 0) { - int fd = -1; - fd = open("/dev/vpu_service", O_RDWR); - if (fd >= 0) { - ret = (RK_S32)ioctl(fd, VPU_IOC_PROBE_IOMMU_STATUS, &vpu_service_iommu_status); - if (ret) { - vpu_service_iommu_status = 0; - mpp_err_f("VPUClient: ioctl VPU_IOC_PROBE_IOMMU_STATUS failed ret %d, disable iommu\n", ret); - } - close(fd); - } else { - vpu_service_iommu_status = 0; - } - } - mpp_log("vpu_service_iommu_status %d", vpu_service_iommu_status); - } - - return vpu_service_iommu_status; + mpp_log("Get IOMMU Status always return 1\n"); + return 1; }