diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-11-07 13:35:39 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-11-07 20:24:07 -0500 |
commit | 700a95bbebbbd8c228a3ee181462c0e8fc479090 (patch) | |
tree | 030a7658fde37b84af8a647a2a9b5fdbe970255d /drivers/gpu/nvgpu | |
parent | 33bd07db7ddceb715be65e56604195721ff4da77 (diff) |
gpu: nvgpu: Use is_enabled flags also in vgpu
One vgpu file was not changed when all nvgpu flags were moved to
use nvgpu_is_enabled().
JIRA NVGPU-259
Change-Id: Ie3964ed05ce5831cb2bd3cd51c07bb19a1f1d4d3
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1593688
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Peter Daifuku <pdaifuku@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gm20b/vgpu_gr_gm20b.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_gr_gm20b.c b/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_gr_gm20b.c index 06cc2a4a..56b1edbc 100644 --- a/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_gr_gm20b.c +++ b/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_gr_gm20b.c | |||
@@ -20,6 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <nvgpu/enabled.h> | ||
24 | |||
23 | #include "gk20a/gk20a.h" | 25 | #include "gk20a/gk20a.h" |
24 | #include "gk20a/css_gr_gk20a.h" | 26 | #include "gk20a/css_gr_gk20a.h" |
25 | #include "vgpu/css_vgpu.h" | 27 | #include "vgpu/css_vgpu.h" |
@@ -28,10 +30,8 @@ | |||
28 | void vgpu_gr_gm20b_init_cyclestats(struct gk20a *g) | 30 | void vgpu_gr_gm20b_init_cyclestats(struct gk20a *g) |
29 | { | 31 | { |
30 | #if defined(CONFIG_GK20A_CYCLE_STATS) | 32 | #if defined(CONFIG_GK20A_CYCLE_STATS) |
31 | g->gpu_characteristics.flags |= | 33 | __nvgpu_set_enabled(g, NVGPU_SUPPORT_CYCLE_STATS, true); |
32 | NVGPU_GPU_FLAGS_SUPPORT_CYCLE_STATS; | 34 | __nvgpu_set_enabled(g, NVGPU_SUPPORT_CYCLE_STATS_SNAPSHOT, true); |
33 | g->gpu_characteristics.flags |= | ||
34 | NVGPU_GPU_FLAGS_SUPPORT_CYCLE_STATS_SNAPSHOT; | ||
35 | g->gpu_characteristics.max_css_buffer_size = | 35 | g->gpu_characteristics.max_css_buffer_size = |
36 | vgpu_css_get_buffer_size(g); | 36 | vgpu_css_get_buffer_size(g); |
37 | #endif | 37 | #endif |