gpu: nvgpu: split vidmem_is_vidmem

As the vidmem_is_vidmem flag has got two separate meanings in one bit,
split it in two bits into the enabled() API:

Add NVGPU_MM_HONORS_APERTURE bit, which is the same as vidmem_is_vidmem
with its original meaning, and use it to test which aperture bits to
write to hardware.

Add NVGPU_MM_UNIFIED_MEMORY bit, which has the opposite meaning: that
the GPU shares the SoC memory. When this flag is false, the GPU has its
own local video memory.

Jira NVGPU-86

Change-Id: I2d0bed3b1ede5a712be99323d3035b154bb23c3a
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: http://git-master/r/1496080
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

4 files changed, 15 insertions, 10 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/dma.c b/drivers/gpu/nvgpu/common/linux/dma.c
index 53f3a35e..5fee878a 100644
--- a/drivers/gpu/nvgpu/common/linux/dma.c
+++ b/drivers/gpu/nvgpu/common/linux/dma.c
@@ -21,6 +21,7 @@
 #include <nvgpu/lock.h>
 #include <nvgpu/bug.h>
 #include <nvgpu/gmmu.h>
+#include <nvgpu/enabled.h>
 
 #include <nvgpu/linux/dma.h>
 
@@ -69,7 +70,7 @@ int nvgpu_dma_alloc(struct gk20a *g, size_t size, struct nvgpu_mem *mem)
 int nvgpu_dma_alloc_flags(struct gk20a *g, unsigned long flags, size_t size,
                 struct nvgpu_mem *mem)
 {
-        if (g->mm.vidmem_is_vidmem) {
+        if (!nvgpu_is_enabled(g, NVGPU_MM_UNIFIED_MEMORY)) {
                 /*
                  * Force the no-kernel-mapping flag on because we don't support
                  * the lack of it for vidmem - the user should not care when
@@ -251,7 +252,7 @@ int nvgpu_dma_alloc_map(struct vm_gk20a *vm, size_t size,
 int nvgpu_dma_alloc_map_flags(struct vm_gk20a *vm, unsigned long flags,
                 size_t size, struct nvgpu_mem *mem)
 {
-        if (vm->mm->vidmem_is_vidmem) {
+        if (!nvgpu_is_enabled(gk20a_from_vm(vm), NVGPU_MM_UNIFIED_MEMORY)) {
                 /*
                  * Force the no-kernel-mapping flag on because we don't support
                  * the lack of it for vidmem - the user should not care when
diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.c b/drivers/gpu/nvgpu/common/linux/driver_common.c
index f85016d4..bd9a4e77 100644
--- a/drivers/gpu/nvgpu/common/linux/driver_common.c
+++ b/drivers/gpu/nvgpu/common/linux/driver_common.c
@@ -133,8 +133,10 @@ static void nvgpu_init_mm_vars(struct gk20a *g)
 
         g->mm.bypass_smmu = platform->bypass_smmu;
         g->mm.disable_bigpage = platform->disable_bigpage;
-        g->mm.vidmem_is_vidmem = platform->vidmem_is_vidmem;
-
+        __nvgpu_set_enabled(g, NVGPU_MM_HONORS_APERTURE,
+                            platform->honors_aperture);
+        __nvgpu_set_enabled(g, NVGPU_MM_UNIFIED_MEMORY,
+                            platform->unified_memory);
         __nvgpu_set_enabled(g, NVGPU_MM_UNIFY_ADDRESS_SPACES,
                             platform->unify_address_spaces);
 
diff --git a/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c b/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c
index 58488067..34fd6626 100644
--- a/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c
+++ b/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c
@@ -19,6 +19,7 @@
 #include <nvgpu/page_allocator.h>
 #include <nvgpu/log.h>
 #include <nvgpu/bug.h>
+#include <nvgpu/enabled.h>
 
 #include <nvgpu/linux/dma.h>
 
@@ -30,8 +31,9 @@ u32 __nvgpu_aperture_mask(struct gk20a *g, enum nvgpu_aperture aperture,
 {
         switch (aperture) {
         case APERTURE_SYSMEM:
-                /* sysmem for dgpus; some igpus consider system memory vidmem */
-                return g->mm.vidmem_is_vidmem ? sysmem_mask : vidmem_mask;
+                /* some igpus consider system memory vidmem */
+                return nvgpu_is_enabled(g, NVGPU_MM_HONORS_APERTURE)
+                        ? sysmem_mask : vidmem_mask;
         case APERTURE_VIDMEM:
                 /* for dgpus only */
                 return vidmem_mask;
diff --git a/drivers/gpu/nvgpu/common/linux/pci.c b/drivers/gpu/nvgpu/common/linux/pci.c
index 0a5095fe..b66a6658 100644
--- a/drivers/gpu/nvgpu/common/linux/pci.c
+++ b/drivers/gpu/nvgpu/common/linux/pci.c
@@ -86,7 +86,7 @@ static struct gk20a_platform nvgpu_pci_device[] = {
 
         .ch_wdt_timeout_ms = 7000,
 
-        .vidmem_is_vidmem = true,
+        .honors_aperture = true,
         .vbios_min_version = 0x86063000,
         .hardcode_sw_threshold = true,
         .ina3221_dcb_index = 0,
@@ -121,7 +121,7 @@ static struct gk20a_platform nvgpu_pci_device[] = {
 
         .ch_wdt_timeout_ms = 7000,
 
-        .vidmem_is_vidmem = true,
+        .honors_aperture = true,
         .vbios_min_version = 0x86062d00,
         .hardcode_sw_threshold = true,
         .ina3221_dcb_index = 0,
@@ -156,7 +156,7 @@ static struct gk20a_platform nvgpu_pci_device[] = {
 
         .ch_wdt_timeout_ms = 7000,
 
-        .vidmem_is_vidmem = true,
+        .honors_aperture = true,
         .vbios_min_version = 0x86063000,
         .hardcode_sw_threshold = true,
         .ina3221_dcb_index = 0,
@@ -191,7 +191,7 @@ static struct gk20a_platform nvgpu_pci_device[] = {
 
         .ch_wdt_timeout_ms = 7000,
 
-        .vidmem_is_vidmem = true,
+        .honors_aperture = true,
         .vbios_min_version = 0x86065600,
         .hardcode_sw_threshold = false,
         .ina3221_dcb_index = 1,