2 files changed, 17 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/module.c b/drivers/gpu/nvgpu/common/linux/module.c
index adf9ff37..d5fc40de 100644
--- a/drivers/gpu/nvgpu/common/linux/module.c
+++ b/drivers/gpu/nvgpu/common/linux/module.c
@@ -28,6 +28,7 @@
 #include <nvgpu/kmem.h>
 #include <nvgpu/nvgpu_common.h>
 #include <nvgpu/soc.h>
+#include <nvgpu/enabled.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/platform_gk20a.h"
@@ -873,11 +874,15 @@ static int gk20a_probe(struct platform_device *dev)
         set_gk20a(dev, gk20a);
         gk20a->dev = &dev->dev;
 
-        if (nvgpu_platform_is_simulation(gk20a))
-                gk20a->is_fmodel = true;
-
         nvgpu_kmem_init(gk20a);
 
+        err = nvgpu_init_enabled_flags(gk20a);
+        if (err)
+                return err;
+
+        if (nvgpu_platform_is_simulation(gk20a))
+                __nvgpu_set_enabled(gk20a, NVGPU_IS_FMODEL, true);
+
         gk20a->irq_stall = platform_get_irq(dev, 0);
         gk20a->irq_nonstall = platform_get_irq(dev, 1);
         if (gk20a->irq_stall < 0 || gk20a->irq_nonstall < 0)
diff --git a/drivers/gpu/nvgpu/common/linux/pci.c b/drivers/gpu/nvgpu/common/linux/pci.c
index 767e9d47..0a5095fe 100644
--- a/drivers/gpu/nvgpu/common/linux/pci.c
+++ b/drivers/gpu/nvgpu/common/linux/pci.c
@@ -20,6 +20,7 @@
 
 #include <nvgpu/nvgpu_common.h>
 #include <nvgpu/kmem.h>
+#include <nvgpu/enabled.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/platform_gk20a.h"
@@ -358,11 +359,17 @@ static int nvgpu_pci_probe(struct pci_dev *pdev,
                 return -ENOMEM;
         }
 
+        nvgpu_kmem_init(g);
+
+        err = nvgpu_init_enabled_flags(g);
+        if (err) {
+                kfree(g);
+                return err;
+        }
+
         platform->g = g;
         g->dev = &pdev->dev;
 
-        nvgpu_kmem_init(g);
-
         err = pci_enable_device(pdev);
         if (err)
                 return err;