drm/rockchip: gem: don't limit to 32bit mapping when not support LPAE
authorMark Yao <mark.yao@rock-chips.com>
Fri, 16 Jun 2017 00:57:52 +0000 (08:57 +0800)
committerMark Yao <mark.yao@rock-chips.com>
Fri, 16 Jun 2017 01:36:03 +0000 (09:36 +0800)
Change-Id: I3d2b41cfb0be3122ccb291802feb950017acdf44
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
drivers/gpu/drm/rockchip/rockchip_drm_gem.c

index 3a26e9a0f68d8ed72aa164427a475a6af980a1ac..fa34c17bde4d07ffb4e870c50d9c98248eac59d8 100644 (file)
@@ -447,8 +447,11 @@ rockchip_gem_alloc_object(struct drm_device *drm, unsigned int size)
 
        drm_gem_object_init(drm, obj, size);
 
-       mapping = file_inode(obj->filp)->i_mapping;
-       mapping_set_gfp_mask(mapping, mapping_gfp_mask(mapping) | __GFP_DMA32);
+       if (IS_ENABLED(CONFIG_ARM_LPAE)) {
+               mapping = file_inode(obj->filp)->i_mapping;
+               mapping_set_gfp_mask(mapping,
+                                    mapping_gfp_mask(mapping) | __GFP_DMA32);
+       }
 
        return rk_obj;
 }