diff options
author | Thomas Fleury <tfleury@nvidia.com> | 2017-12-13 19:54:01 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-12-14 17:28:09 -0500 |
commit | 28a642f6bbf62dce632d6d4ef75eabc1da0128ef (patch) | |
tree | 426bdbc7a18dff76b4748784366543d42f072cbe /drivers | |
parent | 159d77a69d7a59abc9ee1d0a918cee4a3c04da38 (diff) |
gpu: nvgpu: vgpu: allow disabling of ctxsw tracing
Fixed build failure that occurred when disabling FECS ctxsw
tracing using CONFIG_GK20A_CTXSW_TRACE.
JIRA EVLR-2162
Change-Id: I751eba835c5f3f527571167e8b05fadb9687c64d
Signed-off-by: Thomas Fleury <tfleury@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1617557
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Richard Zhao <rizhao@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Aparna Das <aparnad@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Dennis Kou <dkou@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers')
4 files changed, 10 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c b/drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c index 5007de36..5344313a 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c | |||
@@ -190,6 +190,7 @@ int vgpu_mmap_user_buffer(struct gk20a *g, struct vm_area_struct *vma) | |||
190 | vma->vm_page_prot); | 190 | vma->vm_page_prot); |
191 | } | 191 | } |
192 | 192 | ||
193 | #ifdef CONFIG_GK20A_CTXSW_TRACE | ||
193 | int vgpu_fecs_trace_max_entries(struct gk20a *g, | 194 | int vgpu_fecs_trace_max_entries(struct gk20a *g, |
194 | struct nvgpu_ctxsw_trace_filter *filter) | 195 | struct nvgpu_ctxsw_trace_filter *filter) |
195 | { | 196 | { |
@@ -223,3 +224,4 @@ void vgpu_fecs_trace_data_update(struct gk20a *g) | |||
223 | { | 224 | { |
224 | gk20a_ctxsw_trace_wake_up(g, 0); | 225 | gk20a_ctxsw_trace_wake_up(g, 0); |
225 | } | 226 | } |
227 | #endif /* CONFIG_GK20A_CTXSW_TRACE */ | ||
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_hal_gp10b.c index 7c376396..31608200 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_hal_gp10b.c | |||
@@ -522,7 +522,9 @@ int vgpu_gp10b_init_hal(struct gk20a *g) | |||
522 | gops->clock_gating = vgpu_gp10b_ops.clock_gating; | 522 | gops->clock_gating = vgpu_gp10b_ops.clock_gating; |
523 | gops->fifo = vgpu_gp10b_ops.fifo; | 523 | gops->fifo = vgpu_gp10b_ops.fifo; |
524 | gops->gr_ctx = vgpu_gp10b_ops.gr_ctx; | 524 | gops->gr_ctx = vgpu_gp10b_ops.gr_ctx; |
525 | #ifdef CONFIG_GK20A_CTXSW_TRACE | ||
525 | gops->fecs_trace = vgpu_gp10b_ops.fecs_trace; | 526 | gops->fecs_trace = vgpu_gp10b_ops.fecs_trace; |
527 | #endif | ||
526 | gops->mm = vgpu_gp10b_ops.mm; | 528 | gops->mm = vgpu_gp10b_ops.mm; |
527 | gops->pramin = vgpu_gp10b_ops.pramin; | 529 | gops->pramin = vgpu_gp10b_ops.pramin; |
528 | gops->therm = vgpu_gp10b_ops.therm; | 530 | gops->therm = vgpu_gp10b_ops.therm; |
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_hal_gv11b.c index 7372a956..b41d9dc3 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_hal_gv11b.c | |||
@@ -568,7 +568,9 @@ int vgpu_gv11b_init_hal(struct gk20a *g) | |||
568 | gops->fifo = vgpu_gv11b_ops.fifo; | 568 | gops->fifo = vgpu_gv11b_ops.fifo; |
569 | gops->gr_ctx = vgpu_gv11b_ops.gr_ctx; | 569 | gops->gr_ctx = vgpu_gv11b_ops.gr_ctx; |
570 | gops->mm = vgpu_gv11b_ops.mm; | 570 | gops->mm = vgpu_gv11b_ops.mm; |
571 | #ifdef CONFIG_GK20A_CTXSW_TRACE | ||
571 | gops->fecs_trace = vgpu_gv11b_ops.fecs_trace; | 572 | gops->fecs_trace = vgpu_gv11b_ops.fecs_trace; |
573 | #endif | ||
572 | gops->therm = vgpu_gv11b_ops.therm; | 574 | gops->therm = vgpu_gv11b_ops.therm; |
573 | gops->pmu = vgpu_gv11b_ops.pmu; | 575 | gops->pmu = vgpu_gv11b_ops.pmu; |
574 | gops->regops = vgpu_gv11b_ops.regops; | 576 | gops->regops = vgpu_gv11b_ops.regops; |
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.c b/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.c index 1ec0bc1c..3ff68ec2 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.c | |||
@@ -191,9 +191,11 @@ static int vgpu_intr_thread(void *dev_id) | |||
191 | vgpu_ce2_nonstall_isr(g, | 191 | vgpu_ce2_nonstall_isr(g, |
192 | &msg->info.ce2_nonstall_intr); | 192 | &msg->info.ce2_nonstall_intr); |
193 | break; | 193 | break; |
194 | #ifdef CONFIG_GK20A_CTXSW_TRACE | ||
194 | case TEGRA_VGPU_EVENT_FECS_TRACE: | 195 | case TEGRA_VGPU_EVENT_FECS_TRACE: |
195 | vgpu_fecs_trace_data_update(g); | 196 | vgpu_fecs_trace_data_update(g); |
196 | break; | 197 | break; |
198 | #endif | ||
197 | case TEGRA_VGPU_EVENT_CHANNEL: | 199 | case TEGRA_VGPU_EVENT_CHANNEL: |
198 | vgpu_handle_channel_event(g, &msg->info.channel_event); | 200 | vgpu_handle_channel_event(g, &msg->info.channel_event); |
199 | break; | 201 | break; |
@@ -508,7 +510,9 @@ int vgpu_pm_finalize_poweron(struct device *dev) | |||
508 | if (err) | 510 | if (err) |
509 | goto done; | 511 | goto done; |
510 | 512 | ||
513 | #ifdef CONFIG_GK20A_CTXSW_TRACE | ||
511 | gk20a_ctxsw_trace_init(g); | 514 | gk20a_ctxsw_trace_init(g); |
515 | #endif | ||
512 | gk20a_sched_ctrl_init(g); | 516 | gk20a_sched_ctrl_init(g); |
513 | gk20a_channel_resume(g); | 517 | gk20a_channel_resume(g); |
514 | 518 | ||