diff options
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu/gm20b')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gm20b/vgpu_gr_gm20b.c | 14 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gm20b/vgpu_gr_gm20b.h | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gm20b/vgpu_hal_gm20b.c | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_gr_gm20b.c b/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_gr_gm20b.c index 06962a86..06cc2a4a 100644 --- a/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_gr_gm20b.c +++ b/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_gr_gm20b.c | |||
@@ -21,8 +21,22 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include "gk20a/gk20a.h" | 23 | #include "gk20a/gk20a.h" |
24 | #include "gk20a/css_gr_gk20a.h" | ||
25 | #include "vgpu/css_vgpu.h" | ||
24 | #include "vgpu_gr_gm20b.h" | 26 | #include "vgpu_gr_gm20b.h" |
25 | 27 | ||
28 | void vgpu_gr_gm20b_init_cyclestats(struct gk20a *g) | ||
29 | { | ||
30 | #if defined(CONFIG_GK20A_CYCLE_STATS) | ||
31 | g->gpu_characteristics.flags |= | ||
32 | NVGPU_GPU_FLAGS_SUPPORT_CYCLE_STATS; | ||
33 | g->gpu_characteristics.flags |= | ||
34 | NVGPU_GPU_FLAGS_SUPPORT_CYCLE_STATS_SNAPSHOT; | ||
35 | g->gpu_characteristics.max_css_buffer_size = | ||
36 | vgpu_css_get_buffer_size(g); | ||
37 | #endif | ||
38 | } | ||
39 | |||
26 | int vgpu_gm20b_init_fs_state(struct gk20a *g) | 40 | int vgpu_gm20b_init_fs_state(struct gk20a *g) |
27 | { | 41 | { |
28 | struct gr_gk20a *gr = &g->gr; | 42 | struct gr_gk20a *gr = &g->gr; |
diff --git a/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_gr_gm20b.h b/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_gr_gm20b.h index 993a8f3d..a0a89579 100644 --- a/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_gr_gm20b.h +++ b/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_gr_gm20b.h | |||
@@ -25,6 +25,7 @@ | |||
25 | 25 | ||
26 | #include "gk20a/gk20a.h" | 26 | #include "gk20a/gk20a.h" |
27 | 27 | ||
28 | void vgpu_gr_gm20b_init_cyclestats(struct gk20a *g); | ||
28 | int vgpu_gm20b_init_fs_state(struct gk20a *g); | 29 | int vgpu_gm20b_init_fs_state(struct gk20a *g); |
29 | 30 | ||
30 | #endif | 31 | #endif |
diff --git a/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_hal_gm20b.c b/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_hal_gm20b.c index 38d07ee2..81bcdc21 100644 --- a/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_hal_gm20b.c +++ b/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_hal_gm20b.c | |||
@@ -130,7 +130,7 @@ static const struct gpu_ops vgpu_gm20b_ops = { | |||
130 | .get_max_fbps_count = vgpu_gr_get_max_fbps_count, | 130 | .get_max_fbps_count = vgpu_gr_get_max_fbps_count, |
131 | .init_sm_dsm_reg_info = gr_gm20b_init_sm_dsm_reg_info, | 131 | .init_sm_dsm_reg_info = gr_gm20b_init_sm_dsm_reg_info, |
132 | .wait_empty = gr_gk20a_wait_idle, | 132 | .wait_empty = gr_gk20a_wait_idle, |
133 | .init_cyclestats = gr_gm20b_init_cyclestats, | 133 | .init_cyclestats = vgpu_gr_gm20b_init_cyclestats, |
134 | .set_sm_debug_mode = vgpu_gr_set_sm_debug_mode, | 134 | .set_sm_debug_mode = vgpu_gr_set_sm_debug_mode, |
135 | .enable_cde_in_fecs = gr_gm20b_enable_cde_in_fecs, | 135 | .enable_cde_in_fecs = gr_gm20b_enable_cde_in_fecs, |
136 | .bpt_reg_info = gr_gm20b_bpt_reg_info, | 136 | .bpt_reg_info = gr_gm20b_bpt_reg_info, |