From d6a9b1dae1f44799e851fd5bae04fdeae4f42d20 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 7 Nov 2018 08:30:17 -0800 Subject: [PATCH] gpu: nvgpu: Move gv100 perf policy to pmu_perf While code communicating with PMU perf got moved to pmu_perf, the file implementing gv100 specifics got left behind. Move that, to pmu_perf, too. JIRA NVGPU-596 Change-Id: I2b59970ca60fee8c6c1f19b54dcebfb65c1fde80 Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1944887 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile | 2 +- drivers/gpu/nvgpu/Makefile.sources | 2 +- drivers/gpu/nvgpu/gv100/hal_gv100.c | 2 +- drivers/gpu/nvgpu/{gv100 => pmu_perf}/perf_gv100.c | 2 +- drivers/gpu/nvgpu/{gv100 => pmu_perf}/perf_gv100.h | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename drivers/gpu/nvgpu/{gv100 => pmu_perf}/perf_gv100.c (99%) rename drivers/gpu/nvgpu/{gv100 => pmu_perf}/perf_gv100.h (100%) diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 9bcbf2850..6ce6afe43 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -348,7 +348,6 @@ nvgpu-y += \ gv100/flcn_gv100.o \ gv100/nvlink_gv100.o \ gv100/hal_gv100.o \ - gv100/perf_gv100.o \ gv100/gsp_gv100.o \ gv100/clk_gv100.o \ tu104/hal_tu104.o \ @@ -373,6 +372,7 @@ nvgpu-y += \ pmu_perf/vfe_var.o \ pmu_perf/vfe_equ.o \ pmu_perf/pmu_perf.o \ + pmu_perf/perf_gv100.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 69d267843..7afe388aa 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -168,6 +168,7 @@ srcs := os/posix/nvgpu.c \ pmu_perf/pmu_perf.c \ pmu_perf/vfe_equ.c \ pmu_perf/vfe_var.c \ + pmu_perf/perf_gv100.c \ pmgr/pmgr.c \ pmgr/pmgrpmu.c \ pmgr/pwrdev.c \ @@ -226,7 +227,6 @@ srcs := os/posix/nvgpu.c \ gv100/flcn_gv100.c \ gv100/nvlink_gv100.c \ gv100/hal_gv100.c \ - gv100/perf_gv100.c \ gv100/gsp_gv100.c \ gv100/clk_gv100.c \ common/bus/bus_tu104.c \ diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index 826b33c77..4fa8ca2cf 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c @@ -60,6 +60,7 @@ #include "common/pmu/acr_gp106.h" #include "common/pmu/pmu_gv11b.h" #include "common/pmu/pmu_gv100.h" +#include "pmu_perf/perf_gv100.h" #include "gk20a/fifo_gk20a.h" #include "gk20a/fecs_trace_gk20a.h" @@ -101,7 +102,6 @@ #include "gv100/mm_gv100.h" #include "gv100/nvlink_gv100.h" #include "gv100/regops_gv100.h" -#include "gv100/perf_gv100.h" #include "gv100/clk_gv100.h" #include diff --git a/drivers/gpu/nvgpu/gv100/perf_gv100.c b/drivers/gpu/nvgpu/pmu_perf/perf_gv100.c similarity index 99% rename from drivers/gpu/nvgpu/gv100/perf_gv100.c rename to drivers/gpu/nvgpu/pmu_perf/perf_gv100.c index 88f687c65..111a2bb46 100644 --- a/drivers/gpu/nvgpu/gv100/perf_gv100.c +++ b/drivers/gpu/nvgpu/pmu_perf/perf_gv100.c @@ -26,7 +26,7 @@ #include #include -#include "gv100/perf_gv100.h" +#include "perf_gv100.h" static int pmu_set_boot_clk_runcb_fn(void *arg) { diff --git a/drivers/gpu/nvgpu/gv100/perf_gv100.h b/drivers/gpu/nvgpu/pmu_perf/perf_gv100.h similarity index 100% rename from drivers/gpu/nvgpu/gv100/perf_gv100.h rename to drivers/gpu/nvgpu/pmu_perf/perf_gv100.h