diff options
author | Timo Alho <talho@nvidia.com> | 2017-10-12 13:22:48 -0400 |
---|---|---|
committer | Srikar Srimath Tirumala <srikars@nvidia.com> | 2017-10-12 16:46:09 -0400 |
commit | a693acc5b45020b359bf11f0370b7dd63d4f994c (patch) | |
tree | e5d15ff13ef2d8d38a29a59e5ef5655de2abad8a | |
parent | 82f235b5299c65446398d63fd3c982853fc1de23 (diff) |
Revert "gpu: nvgpu: gv11b: disable cycle stat"
This reverts commit 6647e5c9569258fbf3db096275a79f86f86ed3a6.
Bug 200352825
Change-Id: Ia44d61eafce78f99be2271e0afaf69cd5c102080
Signed-off-by: Timo Alho <talho@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1577920
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Tested-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Srikar Srimath Tirumala <srikars@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/gr_gv11b.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c index c3f19fa2..da683af6 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c | |||
@@ -1688,7 +1688,12 @@ void gr_gv11b_commit_global_attrib_cb(struct gk20a *g, | |||
1688 | void gr_gv11b_init_cyclestats(struct gk20a *g) | 1688 | void gr_gv11b_init_cyclestats(struct gk20a *g) |
1689 | { | 1689 | { |
1690 | #if defined(CONFIG_GK20A_CYCLE_STATS) | 1690 | #if defined(CONFIG_GK20A_CYCLE_STATS) |
1691 | /* TODO: waiting for cycle stats to be implemented for gv11b */ | 1691 | g->gpu_characteristics.flags |= |
1692 | NVGPU_GPU_FLAGS_SUPPORT_CYCLE_STATS; | ||
1693 | g->gpu_characteristics.flags |= | ||
1694 | NVGPU_GPU_FLAGS_SUPPORT_CYCLE_STATS_SNAPSHOT; | ||
1695 | #else | ||
1696 | (void)g; | ||
1692 | #endif | 1697 | #endif |
1693 | } | 1698 | } |
1694 | 1699 | ||