diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.c | 56 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.h | 32 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 4 |
3 files changed, 2 insertions, 90 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.c b/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.c deleted file mode 100644 index 3dc672ff..00000000 --- a/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.c +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | /* | ||
2 | * GP10B GPU FECS traces | ||
3 | * | ||
4 | * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. | ||
5 | * | ||
6 | * Permission is hereby granted, free of charge, to any person obtaining a | ||
7 | * copy of this software and associated documentation files (the "Software"), | ||
8 | * to deal in the Software without restriction, including without limitation | ||
9 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
10 | * and/or sell copies of the Software, and to permit persons to whom the | ||
11 | * Software is furnished to do so, subject to the following conditions: | ||
12 | * | ||
13 | * The above copyright notice and this permission notice shall be included in | ||
14 | * all copies or substantial portions of the Software. | ||
15 | * | ||
16 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
17 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
18 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
19 | * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
20 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
21 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
22 | * DEALINGS IN THE SOFTWARE. | ||
23 | */ | ||
24 | |||
25 | #include <nvgpu/gk20a.h> | ||
26 | |||
27 | #include "gk20a/fecs_trace_gk20a.h" | ||
28 | |||
29 | #include "fecs_trace_gp10b.h" | ||
30 | |||
31 | #include <nvgpu/hw/gp10b/hw_ctxsw_prog_gp10b.h> | ||
32 | #include <nvgpu/hw/gp10b/hw_gr_gp10b.h> | ||
33 | |||
34 | #ifdef CONFIG_GK20A_CTXSW_TRACE | ||
35 | int gp10b_fecs_trace_flush(struct gk20a *g) | ||
36 | { | ||
37 | struct fecs_method_op_gk20a op = { | ||
38 | .mailbox = { .id = 0, .data = 0, | ||
39 | .clr = ~0, .ok = 0, .fail = 0}, | ||
40 | .method.addr = gr_fecs_method_push_adr_write_timestamp_record_v(), | ||
41 | .method.data = 0, | ||
42 | .cond.ok = GR_IS_UCODE_OP_NOT_EQUAL, | ||
43 | .cond.fail = GR_IS_UCODE_OP_SKIP, | ||
44 | }; | ||
45 | int err; | ||
46 | |||
47 | nvgpu_log(g, gpu_dbg_fn|gpu_dbg_ctxsw, " "); | ||
48 | |||
49 | err = gr_gk20a_elpg_protected_call(g, | ||
50 | gr_gk20a_submit_fecs_method_op(g, op, false)); | ||
51 | if (err) | ||
52 | nvgpu_err(g, "write timestamp record failed"); | ||
53 | |||
54 | return err; | ||
55 | } | ||
56 | #endif /* CONFIG_GK20A_CTXSW_TRACE */ | ||
diff --git a/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.h b/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.h deleted file mode 100644 index 0eda975b..00000000 --- a/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.h +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | /* | ||
2 | * GP10B GPU FECS traces | ||
3 | * | ||
4 | * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. | ||
5 | * | ||
6 | * Permission is hereby granted, free of charge, to any person obtaining a | ||
7 | * copy of this software and associated documentation files (the "Software"), | ||
8 | * to deal in the Software without restriction, including without limitation | ||
9 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
10 | * and/or sell copies of the Software, and to permit persons to whom the | ||
11 | * Software is furnished to do so, subject to the following conditions: | ||
12 | * | ||
13 | * The above copyright notice and this permission notice shall be included in | ||
14 | * all copies or substantial portions of the Software. | ||
15 | * | ||
16 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
17 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
18 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
19 | * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
20 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
21 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
22 | * DEALINGS IN THE SOFTWARE. | ||
23 | */ | ||
24 | |||
25 | #ifndef NVGPU_FECS_TRACE_GP10B_H | ||
26 | #define NVGPU_FECS_TRACE_GP10B_H | ||
27 | |||
28 | struct gk20a; | ||
29 | |||
30 | int gp10b_fecs_trace_flush(struct gk20a *g); | ||
31 | |||
32 | #endif /* NVGPU_FECS_TRACE_GP10B_H */ | ||
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index 5fcfb32f..0723fa0e 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |||
@@ -60,7 +60,6 @@ | |||
60 | #include "gk20a/gr_gk20a.h" | 60 | #include "gk20a/gr_gk20a.h" |
61 | 61 | ||
62 | #include "gp10b/gr_gp10b.h" | 62 | #include "gp10b/gr_gp10b.h" |
63 | #include "gp10b/fecs_trace_gp10b.h" | ||
64 | #include "gp10b/mm_gp10b.h" | 63 | #include "gp10b/mm_gp10b.h" |
65 | #include "gp10b/ce_gp10b.h" | 64 | #include "gp10b/ce_gp10b.h" |
66 | #include "gp10b/pmu_gp10b.h" | 65 | #include "gp10b/pmu_gp10b.h" |
@@ -76,6 +75,7 @@ | |||
76 | #include "gm20b/pmu_gm20b.h" | 75 | #include "gm20b/pmu_gm20b.h" |
77 | #include "gm20b/clk_gm20b.h" | 76 | #include "gm20b/clk_gm20b.h" |
78 | #include "gm20b/mm_gm20b.h" | 77 | #include "gm20b/mm_gm20b.h" |
78 | #include "gm20b/fecs_trace_gm20b.h" | ||
79 | 79 | ||
80 | #include "gp10b.h" | 80 | #include "gp10b.h" |
81 | #include "hal_gp10b.h" | 81 | #include "hal_gp10b.h" |
@@ -537,7 +537,7 @@ static const struct gpu_ops gp10b_ops = { | |||
537 | .disable = gk20a_fecs_trace_disable, | 537 | .disable = gk20a_fecs_trace_disable, |
538 | .is_enabled = gk20a_fecs_trace_is_enabled, | 538 | .is_enabled = gk20a_fecs_trace_is_enabled, |
539 | .reset = gk20a_fecs_trace_reset, | 539 | .reset = gk20a_fecs_trace_reset, |
540 | .flush = gp10b_fecs_trace_flush, | 540 | .flush = gm20b_fecs_trace_flush, |
541 | .poll = gk20a_fecs_trace_poll, | 541 | .poll = gk20a_fecs_trace_poll, |
542 | .bind_channel = gk20a_fecs_trace_bind_channel, | 542 | .bind_channel = gk20a_fecs_trace_bind_channel, |
543 | .unbind_channel = gk20a_fecs_trace_unbind_channel, | 543 | .unbind_channel = gk20a_fecs_trace_unbind_channel, |