From 5403ac99174e39767c11eb9666372768d99151bd Mon Sep 17 00:00:00 2001 From: Aparna Das Date: Fri, 22 Mar 2019 16:23:00 -0700 Subject: [PATCH] gpu: ngpu: vgpu: set unified_memory to true Set variable unified_memory to true for vgpu which enables NVGPU_MM_UNIFIED_MEMORY flag implying vgpu shares SoC memory. Bug 200491757 Change-Id: Ibfcd41d52b74f2377431ab420a01629bfc0f3f9c Signed-off-by: Aparna Das Reviewed-on: https://git-master.nvidia.com/r/2079502 Reviewed-by: mobile promotions Tested-by: mobile promotions --- .../gpu/nvgpu/os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c | 1 + drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c | 1 + drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c | 2 ++ 3 files changed, 4 insertions(+) diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c b/drivers/gpu/nvgpu/os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c index 3ded8d448..57a12f13d 100644 --- a/drivers/gpu/nvgpu/os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c @@ -105,6 +105,7 @@ struct gk20a_platform gv11b_vgpu_tegra_platform = { .suspend = vgpu_tegra_suspend, .resume = vgpu_tegra_resume, + .unified_memory = true, .unify_address_spaces = true, .dma_mask = DMA_BIT_MASK(36), }; diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c b/drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c index 5e4b36874..4e2fd802c 100644 --- a/drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c @@ -95,5 +95,6 @@ struct gk20a_platform vgpu_tegra_platform = { .suspend = vgpu_tegra_suspend, .resume = vgpu_tegra_resume, + .unified_memory = true, .unify_address_spaces = true, }; diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c index e7074f07c..4ffcdf535 100644 --- a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c @@ -97,6 +97,8 @@ static void vgpu_init_vars(struct gk20a *g, struct gk20a_platform *platform) g->railgate_delay = platform->railgate_delay_init; g->mm.disable_bigpage = true; + nvgpu_set_enabled(g, NVGPU_MM_UNIFIED_MEMORY, + platform->unified_memory); nvgpu_set_enabled(g, NVGPU_MM_UNIFY_ADDRESS_SPACES, platform->unify_address_spaces); }