diff options
author | Alex Waterman <alexw@nvidia.com> | 2017-10-26 18:20:39 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-10-29 14:02:24 -0400 |
commit | afd1649cfcae97e873663586d55f9a4cfd671808 (patch) | |
tree | f33bafc371a9f7dff150ec96d0230c2c80763713 | |
parent | f7d8d133bf1b58722ede620fb43fab2053f5e714 (diff) |
gpu: nvgpu: Move ctxsw_trace_gk20a.c to common/linux
Fixups for the change of name subject in nvgpu.
JIRA NVGPU-287
Change-Id: I6c19733079061a42786b94fc48db374d715ccbef
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1586548
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/gv100/hal_gv100.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index 61e9e46d..0950409f 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c | |||
@@ -709,7 +709,9 @@ int gv100_init_hal(struct gk20a *g) | |||
709 | gops->fifo = gv100_ops.fifo; | 709 | gops->fifo = gv100_ops.fifo; |
710 | gops->gr_ctx = gv100_ops.gr_ctx; | 710 | gops->gr_ctx = gv100_ops.gr_ctx; |
711 | gops->mm = gv100_ops.mm; | 711 | gops->mm = gv100_ops.mm; |
712 | #ifdef CONFIG_GK20A_CTXSW_TRACE | ||
712 | gops->fecs_trace = gv100_ops.fecs_trace; | 713 | gops->fecs_trace = gv100_ops.fecs_trace; |
714 | #endif | ||
713 | gops->pramin = gv100_ops.pramin; | 715 | gops->pramin = gv100_ops.pramin; |
714 | gops->therm = gv100_ops.therm; | 716 | gops->therm = gv100_ops.therm; |
715 | gops->pmu = gv100_ops.pmu; | 717 | gops->pmu = gv100_ops.pmu; |
diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c index dc3b641a..d74ddacd 100644 --- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | |||
@@ -1075,10 +1075,12 @@ void gv11b_fifo_teardown_ch_tsg(struct gk20a *g, u32 act_eng_bitmask, | |||
1075 | } | 1075 | } |
1076 | } | 1076 | } |
1077 | 1077 | ||
1078 | #ifdef CONFIG_GK20A_CTXSW_TRACE | ||
1078 | if (refch) | 1079 | if (refch) |
1079 | gk20a_ctxsw_trace_channel_reset(g, refch); | 1080 | gk20a_ctxsw_trace_channel_reset(g, refch); |
1080 | else if (tsg) | 1081 | else if (tsg) |
1081 | gk20a_ctxsw_trace_tsg_reset(g, tsg); | 1082 | gk20a_ctxsw_trace_tsg_reset(g, tsg); |
1083 | #endif | ||
1082 | 1084 | ||
1083 | gk20a_fifo_set_runlist_state(g, runlists_mask, RUNLIST_ENABLED, | 1085 | gk20a_fifo_set_runlist_state(g, runlists_mask, RUNLIST_ENABLED, |
1084 | !RUNLIST_INFO_MUTEX_LOCKED); | 1086 | !RUNLIST_INFO_MUTEX_LOCKED); |
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index 4de9786b..39f9572c 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c | |||
@@ -687,7 +687,9 @@ int gv11b_init_hal(struct gk20a *g) | |||
687 | gops->fifo = gv11b_ops.fifo; | 687 | gops->fifo = gv11b_ops.fifo; |
688 | gops->gr_ctx = gv11b_ops.gr_ctx; | 688 | gops->gr_ctx = gv11b_ops.gr_ctx; |
689 | gops->mm = gv11b_ops.mm; | 689 | gops->mm = gv11b_ops.mm; |
690 | #ifdef CONFIG_GK20A_CTXSW_TRACE | ||
690 | gops->fecs_trace = gv11b_ops.fecs_trace; | 691 | gops->fecs_trace = gv11b_ops.fecs_trace; |
692 | #endif | ||
691 | gops->therm = gv11b_ops.therm; | 693 | gops->therm = gv11b_ops.therm; |
692 | gops->pmu = gv11b_ops.pmu; | 694 | gops->pmu = gv11b_ops.pmu; |
693 | gops->regops = gv11b_ops.regops; | 695 | gops->regops = gv11b_ops.regops; |