From 7b4bff6ebf8b017a278d7aa8fb3f8c8d90aaa11d Mon Sep 17 00:00:00 2001 From: Vedashree Vidwans Date: Tue, 13 Oct 2020 23:42:07 -0700 Subject: [PATCH] gpu: nvgpu: remove unify_address_space enforcement Let nvrm_gpu decide if unified_address_space is required when requesting new address space. JIRA NVGPU_5302 Change-Id: Ib77be5e7c913802a01f7e7861e8bce3d47aed55f Signed-off-by: Vedashree Vidwans Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2427724 Reviewed-by: automaticguardword Reviewed-by: Sami Kiminki Reviewed-by: Alex Waterman Reviewed-by: mobile promotions Tested-by: Sami Kiminki Tested-by: mobile promotions GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/os/linux/pci.c | 4 ---- drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c | 1 - drivers/gpu/nvgpu/os/linux/platform_gv11b_tegra.c | 1 - .../gpu/nvgpu/os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c | 1 - drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c | 1 - 5 files changed, 8 deletions(-) diff --git a/drivers/gpu/nvgpu/os/linux/pci.c b/drivers/gpu/nvgpu/os/linux/pci.c index 1e80cb080..4e5a81892 100644 --- a/drivers/gpu/nvgpu/os/linux/pci.c +++ b/drivers/gpu/nvgpu/os/linux/pci.c @@ -107,7 +107,6 @@ static struct gk20a_platform nvgpu_pci_device[] = { */ .ch_wdt_init_limit_ms = 30000, - .unify_address_spaces = true, .honors_aperture = true, .dma_mask = DMA_BIT_MASK(40), .hardcode_sw_threshold = false, @@ -147,7 +146,6 @@ static struct gk20a_platform nvgpu_pci_device[] = { .ch_wdt_init_limit_ms = 7000, - .unify_address_spaces = true, .honors_aperture = true, .dma_mask = DMA_BIT_MASK(40), .hardcode_sw_threshold = false, @@ -187,7 +185,6 @@ static struct gk20a_platform nvgpu_pci_device[] = { .ch_wdt_init_limit_ms = 7000, - .unify_address_spaces = true, .honors_aperture = true, .dma_mask = DMA_BIT_MASK(40), .hardcode_sw_threshold = false, @@ -227,7 +224,6 @@ static struct gk20a_platform nvgpu_pci_device[] = { .ch_wdt_init_limit_ms = 7000, - .unify_address_spaces = true, .honors_aperture = true, .dma_mask = DMA_BIT_MASK(40), .hardcode_sw_threshold = false, diff --git a/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c b/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c index 0a3cc3182..d23029945 100644 --- a/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c +++ b/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c @@ -588,7 +588,6 @@ struct gk20a_platform gp10b_tegra_platform = { .soc_name = "tegra18x", .unified_memory = true, - .unify_address_spaces = true, .dma_mask = DMA_BIT_MASK(36), #ifdef CONFIG_NV_TEGRA_MC diff --git a/drivers/gpu/nvgpu/os/linux/platform_gv11b_tegra.c b/drivers/gpu/nvgpu/os/linux/platform_gv11b_tegra.c index 7be04ab65..9f14619aa 100644 --- a/drivers/gpu/nvgpu/os/linux/platform_gv11b_tegra.c +++ b/drivers/gpu/nvgpu/os/linux/platform_gv11b_tegra.c @@ -335,7 +335,6 @@ struct gk20a_platform gv11b_tegra_platform = { .honors_aperture = true, .unified_memory = true, - .unify_address_spaces = true, .dma_mask = DMA_BIT_MASK(36), .reset_assert = gp10b_tegra_reset_assert, 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 18c01bb8d..29da5553b 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 @@ -113,6 +113,5 @@ struct gk20a_platform gv11b_vgpu_tegra_platform = { .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 6066fef6b..1bcc6d79b 100644 --- a/drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c @@ -98,5 +98,4 @@ struct gk20a_platform vgpu_tegra_platform = { .resume = vgpu_tegra_resume, .unified_memory = true, - .unify_address_spaces = true, };