diff --git a/drivers/video/tegra/nvmap/include/linux/nvmap_exports.h b/drivers/video/tegra/nvmap/include/linux/nvmap_exports.h
index 45684ef1..6eff2f56 100644
--- a/drivers/video/tegra/nvmap/include/linux/nvmap_exports.h
+++ b/drivers/video/tegra/nvmap/include/linux/nvmap_exports.h
@@ -10,6 +10,9 @@ void *nvmap_dma_alloc_attrs(struct device *dev, size_t size,
 			    unsigned long attrs);
 void nvmap_dma_free_attrs(struct device *dev, size_t size, void *cpu_addr,
 			  dma_addr_t dma_handle, unsigned long attrs);
-extern struct device tegra_vpr_dev;
-extern struct device tegra_vpr1_dev;
+
+struct device *nvmap_get_vpr_dev(void);
+
+struct device *nvmap_get_vpr1_dev(void);
+
 #endif /* __NVMAP_EXPORTS_H */
diff --git a/drivers/video/tegra/nvmap/nvmap_init.c b/drivers/video/tegra/nvmap/nvmap_init.c
index d9b1b932..4e4bc73c 100644
--- a/drivers/video/tegra/nvmap/nvmap_init.c
+++ b/drivers/video/tegra/nvmap/nvmap_init.c
@@ -36,9 +36,7 @@
 struct device __weak tegra_generic_dev;
 
 struct device tegra_vpr_dev;
-EXPORT_SYMBOL(tegra_vpr_dev);
 struct device tegra_vpr1_dev;
-EXPORT_SYMBOL(tegra_vpr1_dev);
 
 struct device __weak tegra_generic_cma_dev;
 struct device __weak tegra_vpr_cma_dev;
@@ -461,6 +459,18 @@ err:
 	return ERR_PTR(-ENOMEM);
 }
 
+struct device *nvmap_get_vpr_dev(void)
+{
+	return &tegra_vpr_dev;
+}
+EXPORT_SYMBOL(nvmap_get_vpr_dev);
+
+struct device *nvmap_get_vpr1_dev(void)
+{
+	return &tegra_vpr1_dev;
+}
+EXPORT_SYMBOL(nvmap_get_vpr1_dev);
+
 void *nvmap_dma_alloc_attrs(struct device *dev, size_t size,
 			    dma_addr_t *dma_handle,
 			    gfp_t flag, unsigned long attrs)