summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.c
diff options
context:
space:
mode:
authorThomas Fleury <tfleury@nvidia.com>2017-12-13 19:54:01 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2017-12-14 17:28:09 -0500
commit28a642f6bbf62dce632d6d4ef75eabc1da0128ef (patch)
tree426bdbc7a18dff76b4748784366543d42f072cbe /drivers/gpu/nvgpu/common/linux/vgpu/vgpu.c
parent159d77a69d7a59abc9ee1d0a918cee4a3c04da38 (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/gpu/nvgpu/common/linux/vgpu/vgpu.c')
-rw-r--r--drivers/gpu/nvgpu/common/linux/vgpu/vgpu.c4
1 files changed, 4 insertions, 0 deletions
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