[Camera] workaround to fix iommu unmap NULL

Change-Id: Id9361faa66dfdeba8688873e8f00224f380804b6
Reviewed-on: https://tp-biosrd-v02/gerrit/85552
Reviewed-by: Jamess Huang(黃以民) <Jamess_Huang@asus.com>
Tested-by: Jamess Huang(黃以民) <Jamess_Huang@asus.com>

Author: topdjgod

drivers/iommu/dma-iommu.c

@@ -168,12 +168,20 @@ static struct iova *__alloc_iova(struct iova_domain *iovad, size_t size,
 /* The IOVA allocator knows what we mapped, so just unmap whatever that was */
 static void __iommu_dma_unmap(struct iommu_domain *domain, dma_addr_t dma_addr)
 {
-	struct iova_domain *iovad = domain->iova_cookie;
-	unsigned long shift = iova_shift(iovad);
-	unsigned long pfn = dma_addr >> shift;
-	struct iova *iova = find_iova(iovad, pfn);
+	struct iova_domain *iovad;
+	unsigned long shift;
+	unsigned long pfn;
+	struct iova *iova;
 	size_t size;
 
+	/* workaround to kill process unmap NULL */
+	if (domain == NULL)
+		return;
+
+	iovad = domain->iova_cookie;
+	shift = iova_shift(iovad);
+	pfn  = dma_addr >> shift;
+	iova = find_iova(iovad, pfn);
 	if (WARN_ON(!iova))
 		return;
 

drivers/media/platform/rockchip/isp1/capture.c

@@ -1382,7 +1382,6 @@ static void rkisp1_set_fmt(struct rkisp1_stream *stream,
 
 static int rkisp1_dma_attach_device(struct rkisp1_device *rkisp1_dev)
 {
-#if 0 // workaround to avoid iommu unmap NULL
 	struct iommu_domain *domain = rkisp1_dev->domain;
 	struct device *dev = rkisp1_dev->dev;
 	int ret;
@@ -1400,19 +1399,14 @@ static int rkisp1_dma_attach_device(struct rkisp1_device *rkisp1_dev)
 	}
 
 	return ret;
-#else
-	return 0;
-#endif
 }
 
 static void rkisp1_dma_detach_device(struct rkisp1_device *rkisp1_dev)
 {
-#if 0 // workaround to avoid iommu unmap NULL
 	struct iommu_domain *domain = rkisp1_dev->domain;
 	struct device *dev = rkisp1_dev->dev;
 
 	iommu_detach_device(domain, dev);
-#endif
 }
 
 static int rkisp1_fh_open(struct file *filp)