gpu: nvgpu: Linux specific GPU characteristics flags

Make GPU characteristics flags specific to Linux code only. The
rest of driver is moved to using nvgpu_is_enabled() API.

JIRA NVGPU-259

Change-Id: I2faf46ef64c964361c267887b28c9d19806d6d51
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1583876
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 9 insertions, 11 deletions

diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index 1e81796e..c5b62948 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -189,26 +189,24 @@ static int gp106_get_litter_value(struct gk20a *g, int value)
 
 static int gp106_init_gpu_characteristics(struct gk20a *g)
 {
-        struct nvgpu_gpu_characteristics *gpu = &g->gpu_characteristics;
-
         int err;
 
         err = gk20a_init_gpu_characteristics(g);
         if (err)
                 return err;
 
-        gpu->flags |= NVGPU_GPU_FLAGS_SUPPORT_GET_VOLTAGE |
-                        NVGPU_GPU_FLAGS_SUPPORT_GET_CURRENT |
-                        NVGPU_GPU_FLAGS_SUPPORT_GET_POWER |
-                        NVGPU_GPU_FLAGS_SUPPORT_GET_TEMPERATURE |
-                        NVGPU_GPU_FLAGS_SUPPORT_DEVICE_EVENTS |
-                        NVGPU_GPU_FLAGS_SUPPORT_SET_THERM_ALERT_LIMIT;
+        __nvgpu_set_enabled(g, NVGPU_SUPPORT_GET_VOLTAGE, true);
+        __nvgpu_set_enabled(g, NVGPU_SUPPORT_GET_CURRENT, true);
+        __nvgpu_set_enabled(g, NVGPU_SUPPORT_GET_POWER, true);
+        __nvgpu_set_enabled(g, NVGPU_SUPPORT_GET_TEMPERATURE, true);
+        __nvgpu_set_enabled(g, NVGPU_SUPPORT_DEVICE_EVENTS, true);
+        __nvgpu_set_enabled(g, NVGPU_SUPPORT_SET_THERM_ALERT_LIMIT, true);
 
         /* WAR for missing INA3221 on HW2.5 RevA */
         if (g->power_sensor_missing) {
-                gpu->flags &= ~(NVGPU_GPU_FLAGS_SUPPORT_GET_VOLTAGE |
-                                NVGPU_GPU_FLAGS_SUPPORT_GET_CURRENT |
-                                NVGPU_GPU_FLAGS_SUPPORT_GET_POWER);
+                __nvgpu_set_enabled(g, NVGPU_SUPPORT_GET_VOLTAGE, false);
+                __nvgpu_set_enabled(g, NVGPU_SUPPORT_GET_CURRENT, false);
+                __nvgpu_set_enabled(g, NVGPU_SUPPORT_GET_POWER, false);
         }
 
         return 0;