gpu: nvgpu: rename PMU perf unit to pmu_perf

Move all files under perf/* to pmu_perf/* since pmu_perf is logically
appropriate name for PMU's perf unit
Rename perf.c to pmu_perf.c

Also rename the HAL from gops.perf to gops.pmu_perf

Jira NVGPU-1102

Change-Id: I79e73b8b102ddf6b49783c2f38d861cd43b0b4c6
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1819301
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

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 += \
         clk/clk_vf_point.o \
         clk/clk_arb.o \
         clk/clk_freq_controller.o \
-        perf/vfe_var.o \
-        perf/vfe_equ.o \
-        perf/perf.o \
+        pmu_perf/vfe_var.o \
+        pmu_perf/vfe_equ.o \
+        pmu_perf/pmu_perf.o \
         clk/clk.o \
         gp106/clk_gp106.o \
         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 \
         therm/thrmchannel.c \
         therm/thrmdev.c \
         therm/thrmpmu.c \
-        perf/perf.c \
-        perf/vfe_equ.c \
-        perf/vfe_var.c \
+        pmu_perf/pmu_perf.c \
+        pmu_perf/vfe_equ.c \
+        pmu_perf/vfe_var.c \
         pmgr/pmgr.c \
         pmgr/pmgrpmu.c \
         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)
                 err = nvgpu_pmu_handle_perfmon_event(pmu, &msg->msg.perfmon);
                 break;
         case PMU_UNIT_PERF:
-                if (g->ops.perf.handle_pmu_perf_event != NULL) {
-                        err = g->ops.perf.handle_pmu_perf_event(g,
+                if (g->ops.pmu_perf.handle_pmu_perf_event != NULL) {
+                        err = g->ops.pmu_perf.handle_pmu_perf_event(g,
                                 (void *)&msg->msg.perf);
                 } else {
                         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)
         perf_pmu_init_vfe_perf_event(g);
 
         /*register call back for future VFE updates*/
-        g->ops.perf.handle_pmu_perf_event = gv100_pmu_handle_perf_event;
+        g->ops.pmu_perf.handle_pmu_perf_event = gv100_pmu_handle_perf_event;
 
         return status;
 }
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;
 #include "gk20a/ce2_gk20a.h"
 #include "gk20a/fifo_gk20a.h"
 #include "clk/clk.h"
-#include "perf/perf.h"
+#include "pmu_perf/pmu_perf.h"
 #include "pmgr/pmgr.h"
 #include "therm/thrm.h"
 
@@ -1129,7 +1129,7 @@ struct gpu_ops {
         } clk_arb;
         struct {
                 int (*handle_pmu_perf_event)(struct gk20a *g, void *pmu_msg);
-        } perf;
+        } pmu_perf;
         struct {
                 int (*exec_regops)(struct dbg_session_gk20a *dbg_s,
                             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 @@
 
 #include "gp106/bios_gp106.h"
 #include "pstate/pstate.h"
-#include "perf/perf.h"
+#include "pmu_perf/pmu_perf.h"
 #include "lpwr.h"
 
 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 @@
 #include <nvgpu/clk_arb.h>
 #include <nvgpu/gk20a.h>
 
-#include "perf.h"
+#include "pmu_perf.h"
 
 struct perfrpc_pmucmdhandler_params {
         struct nv_pmu_perf_rpc *prpccall;
@@ -81,7 +81,7 @@ u32 perf_pmu_vfe_load(struct gk20a *g)
         memset(&handler, 0, sizeof(struct perfrpc_pmucmdhandler_params));
 
         /*register call back for future VFE updates*/
-        g->ops.perf.handle_pmu_perf_event = pmu_handle_perf_event;
+        g->ops.pmu_perf.handle_pmu_perf_event = pmu_handle_perf_event;
 
         rpccall.function = NV_PMU_PERF_RPC_ID_VFE_LOAD;
         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 @@
 #include <nvgpu/bios.h>
 #include <nvgpu/gk20a.h>
 
-#include "perf.h"
+#include "pmu_perf.h"
 #include "vfe_equ.h"
 #include "boardobj/boardobjgrp.h"
 #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 @@
 #define NVGPU_PERF_VFE_EQU_H
 
 #include "boardobj/boardobjgrp.h"
-#include "perf/vfe_var.h"
+#include "vfe_var.h"
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
 
 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 @@
 #include <nvgpu/bios.h>
 #include <nvgpu/gk20a.h>
 
-#include "perf.h"
+#include "pmu_perf.h"
 #include "vfe_var.h"
 #include "boardobj/boardobjgrp.h"
 #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 @@
 #include <nvgpu/gk20a.h>
 
 #include "clk/clk.h"
-#include "perf/perf.h"
+#include "pmu_perf/pmu_perf.h"
 #include "pmgr/pmgr.h"
 #include "pstate/pstate.h"
 #include "therm/thrm.h"