shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 12:57:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

rk fb: fix complie error when CONFIG_ROCKCHIP_IOMMU is not set

Browse Source
This commit is contained in:
zwl
2014-09-21 10:29:05 +08:00
parent d9a820a163
commit 3b58dafd77
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/video/rockchip/rk_fb.c
View File

@@ -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: