gpu: nvgpu: Begin removing variables in struct gk20a

Begin removing all of the myriad flag variables in struct gk20a and
replace that with one API that checks for flags being enabled or
disabled. The API is as follows:

  bool nvgpu_is_enabled(struct gk20a *g, int flag);
  bool __nvgpu_set_enabled(struct gk20a *g, int flag, bool state);

These APIs allow many of the gk20a flags to be replaced by defines.
This makes flag usage consistent and saves a small amount of memory in
struct gk20a. Also it makes struct gk20a easier to read since there's
less clutter scattered through out.

JIRA NVGPU-84

Change-Id: I6525cecbe97c4e8379e5f53e29ef0b4dbd1a7fc2
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1488049
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

2 files changed, 7 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c
index a3b73cdf..96312a00 100644
--- a/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c
+++ b/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c
@@ -47,6 +47,7 @@
 
 #include <nvgpu/kmem.h>
 #include <nvgpu/bug.h>
+#include <nvgpu/enabled.h>
 
 #include <nvgpu/linux/dma.h>
 
@@ -120,7 +121,7 @@ int gk20a_tegra_secure_page_alloc(struct device *dev)
         dma_addr_t iova;
         size_t size = PAGE_SIZE;
 
-        if (g->is_fmodel)
+        if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL))
                 return -EINVAL;
 
         dma_set_attr(DMA_ATTR_NO_KERNEL_MAPPING, __DMA_ATTR(attrs));
@@ -401,7 +402,7 @@ static bool gk20a_tegra_is_railgated(struct device *dev)
         struct gk20a_platform *platform = dev_get_drvdata(dev);
         bool ret = false;
 
-        if (!g->is_fmodel)
+        if (!nvgpu_is_enabled(g, NVGPU_IS_FMODEL))
                 ret = !tegra_dvfs_is_rail_up(platform->gpu_rail);
 
         return ret;
@@ -419,7 +420,7 @@ static int gm20b_tegra_railgate(struct device *dev)
         struct gk20a_platform *platform = dev_get_drvdata(dev);
         int ret = 0;
 
-        if (g->is_fmodel ||
+        if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL) ||
             !tegra_dvfs_is_rail_up(platform->gpu_rail))
                 return 0;
 
@@ -483,7 +484,7 @@ static int gm20b_tegra_unrailgate(struct device *dev)
         int ret = 0;
         bool first = false;
 
-        if (g->is_fmodel)
+        if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL))
                 return 0;
 
         ret = tegra_dvfs_rail_power_up(platform->gpu_rail);
diff --git a/drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c b/drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c
index 84175e98..971ef66a 100644
--- a/drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c
+++ b/drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c
@@ -28,6 +28,7 @@
 
 #include <nvgpu/kmem.h>
 #include <nvgpu/bug.h>
+#include <nvgpu/enabled.h>
 #include <nvgpu/hashtable.h>
 
 #include "clk.h"
@@ -78,7 +79,7 @@ int gp10b_tegra_get_clocks(struct device *dev)
         struct gk20a_platform *platform = dev_get_drvdata(dev);
         unsigned int i;
 
-        if (g->is_fmodel)
+        if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL))
                 return 0;
 
         platform->num_clks = 0;