[Camera] workaround to avoid iommu unmap NULL

topdjgod · jamess-huang · commit 2f499be80669 · 2019-03-27T17:30:55.000+08:00
Change-Id: I568d2d3b656efc7ff3c95fdccef004355641ea8d
Reviewed-on: https://tp-biosrd-v02/gerrit/85457
Reviewed-by: Jamess Huang(黃以民) &lt;Jamess_Huang@asus.com&gt;
Tested-by: Jamess Huang(黃以民) &lt;Jamess_Huang@asus.com&gt;
diff --git a/drivers/media/platform/rockchip/isp1/capture.c b/drivers/media/platform/rockchip/isp1/capture.c
@@ -1382,6 +1382,7 @@ 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;
@@ -1399,14 +1400,19 @@ 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)

Original file line number	Diff line number	Diff line change
`@@ -1382,6 +1382,7 @@ static void rkisp1_set_fmt(struct rkisp1_stream *stream,`
`1382`	`1382`
`1383`	`1383`	`static int rkisp1_dma_attach_device(struct rkisp1_device *rkisp1_dev)`
`1384`	`1384`	`{`
	`1385`	`+#if 0 // workaround to avoid iommu unmap NULL`
`1385`	`1386`	`struct iommu_domain *domain = rkisp1_dev->domain;`
`1386`	`1387`	`struct device *dev = rkisp1_dev->dev;`
`1387`	`1388`	`int ret;`
`@@ -1399,14 +1400,19 @@ static int rkisp1_dma_attach_device(struct rkisp1_device *rkisp1_dev)`
`1399`	`1400`	`}`
`1400`	`1401`
`1401`	`1402`	`return ret;`
	`1403`	`+#else`
	`1404`	`+ return 0;`
	`1405`	`+#endif`
`1402`	`1406`	`}`
`1403`	`1407`
`1404`	`1408`	`static void rkisp1_dma_detach_device(struct rkisp1_device *rkisp1_dev)`
`1405`	`1409`	`{`
	`1410`	`+#if 0 // workaround to avoid iommu unmap NULL`
`1406`	`1411`	`struct iommu_domain *domain = rkisp1_dev->domain;`
`1407`	`1412`	`struct device *dev = rkisp1_dev->dev;`
`1408`	`1413`
`1409`	`1414`	`iommu_detach_device(domain, dev);`
	`1415`	`+#endif`
`1410`	`1416`	`}`
`1411`	`1417`
`1412`	`1418`	`static int rkisp1_fh_open(struct file *filp)`