diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/Makefile | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/Makefile.sources | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/pmu/pmu_ipc.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv100/perf_gv100.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/gk20a.h | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/lpwr/lpwr.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmu_perf/pmu_perf.c (renamed from drivers/gpu/nvgpu/perf/perf.c) | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmu_perf/pmu_perf.h (renamed from drivers/gpu/nvgpu/perf/perf.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmu_perf/vfe_equ.c (renamed from drivers/gpu/nvgpu/perf/vfe_equ.c) | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmu_perf/vfe_equ.h (renamed from drivers/gpu/nvgpu/perf/vfe_equ.h) | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmu_perf/vfe_var.c (renamed from drivers/gpu/nvgpu/perf/vfe_var.c) | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmu_perf/vfe_var.h (renamed from drivers/gpu/nvgpu/perf/vfe_var.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pstate/pstate.c | 2 |
13 files changed, 18 insertions, 18 deletions
diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 65bef3d3..d7944088 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile | |||
@@ -343,9 +343,9 @@ nvgpu-y += \ | |||
343 | clk/clk_vf_point.o \ | 343 | clk/clk_vf_point.o \ |
344 | clk/clk_arb.o \ | 344 | clk/clk_arb.o \ |
345 | clk/clk_freq_controller.o \ | 345 | clk/clk_freq_controller.o \ |
346 | perf/vfe_var.o \ | 346 | pmu_perf/vfe_var.o \ |
347 | perf/vfe_equ.o \ | 347 | pmu_perf/vfe_equ.o \ |
348 | perf/perf.o \ | 348 | pmu_perf/pmu_perf.o \ |
349 | clk/clk.o \ | 349 | clk/clk.o \ |
350 | gp106/clk_gp106.o \ | 350 | gp106/clk_gp106.o \ |
351 | gp106/clk_arb_gp106.o \ | 351 | gp106/clk_arb_gp106.o \ |
diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index aec49c03..a5325980 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources | |||
@@ -136,9 +136,9 @@ srcs := os/posix/nvgpu.c \ | |||
136 | therm/thrmchannel.c \ | 136 | therm/thrmchannel.c \ |
137 | therm/thrmdev.c \ | 137 | therm/thrmdev.c \ |
138 | therm/thrmpmu.c \ | 138 | therm/thrmpmu.c \ |
139 | perf/perf.c \ | 139 | pmu_perf/pmu_perf.c \ |
140 | perf/vfe_equ.c \ | 140 | pmu_perf/vfe_equ.c \ |
141 | perf/vfe_var.c \ | 141 | pmu_perf/vfe_var.c \ |
142 | pmgr/pmgr.c \ | 142 | pmgr/pmgr.c \ |
143 | pmgr/pmgrpmu.c \ | 143 | pmgr/pmgrpmu.c \ |
144 | pmgr/pwrdev.c \ | 144 | pmgr/pwrdev.c \ |
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c b/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c index 6f1ca88a..f116df13 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c | |||
@@ -607,8 +607,8 @@ static int pmu_handle_event(struct nvgpu_pmu *pmu, struct pmu_msg *msg) | |||
607 | err = nvgpu_pmu_handle_perfmon_event(pmu, &msg->msg.perfmon); | 607 | err = nvgpu_pmu_handle_perfmon_event(pmu, &msg->msg.perfmon); |
608 | break; | 608 | break; |
609 | case PMU_UNIT_PERF: | 609 | case PMU_UNIT_PERF: |
610 | if (g->ops.perf.handle_pmu_perf_event != NULL) { | 610 | if (g->ops.pmu_perf.handle_pmu_perf_event != NULL) { |
611 | err = g->ops.perf.handle_pmu_perf_event(g, | 611 | err = g->ops.pmu_perf.handle_pmu_perf_event(g, |
612 | (void *)&msg->msg.perf); | 612 | (void *)&msg->msg.perf); |
613 | } else { | 613 | } else { |
614 | WARN_ON(true); | 614 | WARN_ON(true); |
diff --git a/drivers/gpu/nvgpu/gv100/perf_gv100.c b/drivers/gpu/nvgpu/gv100/perf_gv100.c index ea4c3662..17a2334b 100644 --- a/drivers/gpu/nvgpu/gv100/perf_gv100.c +++ b/drivers/gpu/nvgpu/gv100/perf_gv100.c | |||
@@ -114,7 +114,7 @@ u32 gv100_perf_pmu_vfe_load(struct gk20a *g) | |||
114 | perf_pmu_init_vfe_perf_event(g); | 114 | perf_pmu_init_vfe_perf_event(g); |
115 | 115 | ||
116 | /*register call back for future VFE updates*/ | 116 | /*register call back for future VFE updates*/ |
117 | g->ops.perf.handle_pmu_perf_event = gv100_pmu_handle_perf_event; | 117 | g->ops.pmu_perf.handle_pmu_perf_event = gv100_pmu_handle_perf_event; |
118 | 118 | ||
119 | return status; | 119 | return status; |
120 | } | 120 | } |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h index 43bc58f7..fa31d0e1 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h | |||
@@ -72,7 +72,7 @@ struct nvgpu_gpfifo_args; | |||
72 | #include "gk20a/ce2_gk20a.h" | 72 | #include "gk20a/ce2_gk20a.h" |
73 | #include "gk20a/fifo_gk20a.h" | 73 | #include "gk20a/fifo_gk20a.h" |
74 | #include "clk/clk.h" | 74 | #include "clk/clk.h" |
75 | #include "perf/perf.h" | 75 | #include "pmu_perf/pmu_perf.h" |
76 | #include "pmgr/pmgr.h" | 76 | #include "pmgr/pmgr.h" |
77 | #include "therm/thrm.h" | 77 | #include "therm/thrm.h" |
78 | 78 | ||
@@ -1129,7 +1129,7 @@ struct gpu_ops { | |||
1129 | } clk_arb; | 1129 | } clk_arb; |
1130 | struct { | 1130 | struct { |
1131 | int (*handle_pmu_perf_event)(struct gk20a *g, void *pmu_msg); | 1131 | int (*handle_pmu_perf_event)(struct gk20a *g, void *pmu_msg); |
1132 | } perf; | 1132 | } pmu_perf; |
1133 | struct { | 1133 | struct { |
1134 | int (*exec_regops)(struct dbg_session_gk20a *dbg_s, | 1134 | int (*exec_regops)(struct dbg_session_gk20a *dbg_s, |
1135 | struct nvgpu_dbg_reg_op *ops, | 1135 | struct nvgpu_dbg_reg_op *ops, |
diff --git a/drivers/gpu/nvgpu/lpwr/lpwr.c b/drivers/gpu/nvgpu/lpwr/lpwr.c index 3c4e4580..c8cfb840 100644 --- a/drivers/gpu/nvgpu/lpwr/lpwr.c +++ b/drivers/gpu/nvgpu/lpwr/lpwr.c | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | #include "gp106/bios_gp106.h" | 28 | #include "gp106/bios_gp106.h" |
29 | #include "pstate/pstate.h" | 29 | #include "pstate/pstate.h" |
30 | #include "perf/perf.h" | 30 | #include "pmu_perf/pmu_perf.h" |
31 | #include "lpwr.h" | 31 | #include "lpwr.h" |
32 | 32 | ||
33 | static int get_lpwr_idx_table(struct gk20a *g) | 33 | static int get_lpwr_idx_table(struct gk20a *g) |
diff --git a/drivers/gpu/nvgpu/perf/perf.c b/drivers/gpu/nvgpu/pmu_perf/pmu_perf.c index 582b2577..a3b94ce9 100644 --- a/drivers/gpu/nvgpu/perf/perf.c +++ b/drivers/gpu/nvgpu/pmu_perf/pmu_perf.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <nvgpu/clk_arb.h> | 25 | #include <nvgpu/clk_arb.h> |
26 | #include <nvgpu/gk20a.h> | 26 | #include <nvgpu/gk20a.h> |
27 | 27 | ||
28 | #include "perf.h" | 28 | #include "pmu_perf.h" |
29 | 29 | ||
30 | struct perfrpc_pmucmdhandler_params { | 30 | struct perfrpc_pmucmdhandler_params { |
31 | struct nv_pmu_perf_rpc *prpccall; | 31 | struct nv_pmu_perf_rpc *prpccall; |
@@ -81,7 +81,7 @@ u32 perf_pmu_vfe_load(struct gk20a *g) | |||
81 | memset(&handler, 0, sizeof(struct perfrpc_pmucmdhandler_params)); | 81 | memset(&handler, 0, sizeof(struct perfrpc_pmucmdhandler_params)); |
82 | 82 | ||
83 | /*register call back for future VFE updates*/ | 83 | /*register call back for future VFE updates*/ |
84 | g->ops.perf.handle_pmu_perf_event = pmu_handle_perf_event; | 84 | g->ops.pmu_perf.handle_pmu_perf_event = pmu_handle_perf_event; |
85 | 85 | ||
86 | rpccall.function = NV_PMU_PERF_RPC_ID_VFE_LOAD; | 86 | rpccall.function = NV_PMU_PERF_RPC_ID_VFE_LOAD; |
87 | rpccall.params.vfe_load.b_load = true; | 87 | rpccall.params.vfe_load.b_load = true; |
diff --git a/drivers/gpu/nvgpu/perf/perf.h b/drivers/gpu/nvgpu/pmu_perf/pmu_perf.h index 71c8086b..71c8086b 100644 --- a/drivers/gpu/nvgpu/perf/perf.h +++ b/drivers/gpu/nvgpu/pmu_perf/pmu_perf.h | |||
diff --git a/drivers/gpu/nvgpu/perf/vfe_equ.c b/drivers/gpu/nvgpu/pmu_perf/vfe_equ.c index 4e93c82e..5b479d7d 100644 --- a/drivers/gpu/nvgpu/perf/vfe_equ.c +++ b/drivers/gpu/nvgpu/pmu_perf/vfe_equ.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include <nvgpu/bios.h> | 23 | #include <nvgpu/bios.h> |
24 | #include <nvgpu/gk20a.h> | 24 | #include <nvgpu/gk20a.h> |
25 | 25 | ||
26 | #include "perf.h" | 26 | #include "pmu_perf.h" |
27 | #include "vfe_equ.h" | 27 | #include "vfe_equ.h" |
28 | #include "boardobj/boardobjgrp.h" | 28 | #include "boardobj/boardobjgrp.h" |
29 | #include "boardobj/boardobjgrp_e255.h" | 29 | #include "boardobj/boardobjgrp_e255.h" |
diff --git a/drivers/gpu/nvgpu/perf/vfe_equ.h b/drivers/gpu/nvgpu/pmu_perf/vfe_equ.h index 98222ee5..6131d090 100644 --- a/drivers/gpu/nvgpu/perf/vfe_equ.h +++ b/drivers/gpu/nvgpu/pmu_perf/vfe_equ.h | |||
@@ -25,7 +25,7 @@ | |||
25 | #define NVGPU_PERF_VFE_EQU_H | 25 | #define NVGPU_PERF_VFE_EQU_H |
26 | 26 | ||
27 | #include "boardobj/boardobjgrp.h" | 27 | #include "boardobj/boardobjgrp.h" |
28 | #include "perf/vfe_var.h" | 28 | #include "vfe_var.h" |
29 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 29 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
30 | 30 | ||
31 | int vfe_equ_sw_setup(struct gk20a *g); | 31 | int vfe_equ_sw_setup(struct gk20a *g); |
diff --git a/drivers/gpu/nvgpu/perf/vfe_var.c b/drivers/gpu/nvgpu/pmu_perf/vfe_var.c index 8518fc26..a94c2d92 100644 --- a/drivers/gpu/nvgpu/perf/vfe_var.c +++ b/drivers/gpu/nvgpu/pmu_perf/vfe_var.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include <nvgpu/bios.h> | 23 | #include <nvgpu/bios.h> |
24 | #include <nvgpu/gk20a.h> | 24 | #include <nvgpu/gk20a.h> |
25 | 25 | ||
26 | #include "perf.h" | 26 | #include "pmu_perf.h" |
27 | #include "vfe_var.h" | 27 | #include "vfe_var.h" |
28 | #include "boardobj/boardobjgrp.h" | 28 | #include "boardobj/boardobjgrp.h" |
29 | #include "boardobj/boardobjgrp_e32.h" | 29 | #include "boardobj/boardobjgrp_e32.h" |
diff --git a/drivers/gpu/nvgpu/perf/vfe_var.h b/drivers/gpu/nvgpu/pmu_perf/vfe_var.h index 98b7c40b..98b7c40b 100644 --- a/drivers/gpu/nvgpu/perf/vfe_var.h +++ b/drivers/gpu/nvgpu/pmu_perf/vfe_var.h | |||
diff --git a/drivers/gpu/nvgpu/pstate/pstate.c b/drivers/gpu/nvgpu/pstate/pstate.c index 0e7404cb..c1f696aa 100644 --- a/drivers/gpu/nvgpu/pstate/pstate.c +++ b/drivers/gpu/nvgpu/pstate/pstate.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include <nvgpu/gk20a.h> | 26 | #include <nvgpu/gk20a.h> |
27 | 27 | ||
28 | #include "clk/clk.h" | 28 | #include "clk/clk.h" |
29 | #include "perf/perf.h" | 29 | #include "pmu_perf/pmu_perf.h" |
30 | #include "pmgr/pmgr.h" | 30 | #include "pmgr/pmgr.h" |
31 | #include "pstate/pstate.h" | 31 | #include "pstate/pstate.h" |
32 | #include "therm/thrm.h" | 32 | #include "therm/thrm.h" |