From: zwl <zwl@rockchips.com>
Date: Sun, 21 Sep 2014 02:29:05 +0000 (+0800)
Subject: rk fb: fix complie error when CONFIG_ROCKCHIP_IOMMU is not set
X-Git-Tag: firefly_0821_release~4649
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3b58dafd777ba44af40028eca1e945e2c85e4596;p=firefly-linux-kernel-4.4.55.git

rk fb: fix complie error when CONFIG_ROCKCHIP_IOMMU is not set
---

diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
index adfeb5690be7..5d5ae6d9a55b 100755
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -2445,8 +2445,11 @@ static int rk_fb_ioctl(struct fb_info *info, unsigned int cmd,
 		u32 hwc_phy[1];
 		if (copy_from_user(hwc_phy, argp, 4))
 			return -EFAULT;
+#ifdef CONFIG_ROCKCHIP_IOMMU
 		if (!dev_drv->iommu_enabled) {
+#endif
 			fix->smem_start = hwc_phy[0];
+#ifdef CONFIG_ROCKCHIP_IOMMU
 		} else {
 			int usr_fd;
 			struct ion_handle *hdl;
@@ -2483,6 +2486,7 @@ static int rk_fb_ioctl(struct fb_info *info, unsigned int cmd,
 			fix->smem_start = phy_addr;
 			ion_hwc[0] = hdl;
 		}
+#endif
 		break;
 	}
 	case RK_FBIOSET_YUV_ADDR: