From fd75c4bf81953c3e8548676ea0b4e400cda9af74 Mon Sep 17 00:00:00 2001 From: Sri Krishna chowdary Date: Tue, 19 May 2015 21:42:37 +0530 Subject: video: tegra: nvmap: always initilize carveout's dma_dev If carveout's dma_dev is not initialized at compile time, initialize it at runtime with the device present within. This is needed to simplify the logic for reserved-memory handling. Remove the redundant device from nvmap_heap. Bug 200027296 Change-Id: Ib44fbc10f12370c012295f3954c29ee8ef627d3f Signed-off-by: Sri Krishna chowdary Reviewed-on: http://git-master/r/744431 (cherry picked from commit aacf26f32307c5864ba19ee4106442aaaa8741d3) Reviewed-on: http://git-master/r/761565 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani --- include/linux/nvmap.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/linux') diff --git a/include/linux/nvmap.h b/include/linux/nvmap.h index ef0f7fd7a..0c2d02562 100644 --- a/include/linux/nvmap.h +++ b/include/linux/nvmap.h @@ -80,6 +80,7 @@ struct nvmap_platform_carveout { struct device *cma_dev; bool resize; struct device *dma_dev; + struct device dev; bool is_ivm; int peer; int vmid; -- cgit v1.2.2