gpu: nvgpu: Move pmu HAL files to common/pmu

Move PMU and ACR HAL source code files to live under common/pmu. Also
update the #include paths and delete unnecessary #include dependencies.

JIRA NVGPU-961

Change-Id: I29a220bce6de0a46b6a5fe8ff7f9dc4d67395348
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1935626
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

drivers/gpu/nvgpu/Makefile

@@ -239,6 +239,16 @@ nvgpu-y += \
 	common/pmu/pmu_pg.o \
 	common/pmu/pmu_perfmon.o \
 	common/pmu/pmu_debug.o \
+	common/pmu/pmu_gk20a.o \
+	common/pmu/pmu_gm20b.o \
+	common/pmu/pmu_gp10b.o \
+	common/pmu/pmu_gp106.o \
+	common/pmu/pmu_gv11b.o \
+	common/pmu/pmu_gv100.o \
+	common/pmu/acr_gm20b.o \
+	common/pmu/acr_gp106.o \
+	common/pmu/acr_gv11b.o \
+	common/pmu/acr_tu104.o \
 	common/sec2/sec2.o \
 	common/sec2/sec2_ipc.o \
 	common/io_common.o \
@@ -262,7 +272,6 @@ nvgpu-y += \
 	gk20a/regops_gk20a.o \
 	gk20a/gr_gk20a.o \
 	gk20a/mm_gk20a.o \
-	gk20a/pmu_gk20a.o \
 	gk20a/flcn_gk20a.o \
 	gk20a/fence_gk20a.o \
 	gk20a/fecs_trace_gk20a.o \
@@ -270,8 +279,6 @@ nvgpu-y += \
 	gm20b/gr_gm20b.o \
 	gm20b/clk_gm20b.o \
 	gm20b/fifo_gm20b.o \
-	gm20b/acr_gm20b.o \
-	gm20b/pmu_gm20b.o \
 	gm20b/mm_gm20b.o \
 	gm20b/regops_gm20b.o
 
@@ -311,7 +318,6 @@ nvgpu-y += \
 	gp10b/ce_gp10b.o \
 	gp10b/fifo_gp10b.o  \
 	gp10b/mm_gp10b.o \
-	gp10b/pmu_gp10b.o \
 	gp10b/hal_gp10b.o \
 	gp10b/regops_gp10b.o \
 	gp10b/fecs_trace_gp10b.o \
@@ -319,10 +325,8 @@ nvgpu-y += \
 	gp10b/ecc_gp10b.o \
 	gp106/hal_gp106.o \
 	gp106/flcn_gp106.o \
-	gp106/pmu_gp106.o \
 	gp106/mclk_gp106.o \
 	gp106/gr_gp106.o \
-	gp106/acr_gp106.o \
 	gp106/sec2_gp106.o \
 	gp106/fifo_gp106.o \
 	gp106/regops_gp106.o \
@@ -333,8 +337,6 @@ nvgpu-y += \
 	gv11b/fifo_gv11b.o \
 	gv11b/mm_gv11b.o \
 	gv11b/ce_gv11b.o \
-	gv11b/pmu_gv11b.o \
-	gv11b/acr_gv11b.o \
 	gv11b/subctx_gv11b.o \
 	gv11b/regops_gv11b.o \
 	gv11b/ecc_gv11b.o \
@@ -346,7 +348,6 @@ nvgpu-y += \
 	gv100/flcn_gv100.o \
 	gv100/nvlink_gv100.o \
 	gv100/hal_gv100.o \
-	gv100/pmu_gv100.o \
 	gv100/perf_gv100.o \
 	gv100/gsp_gv100.o \
 	gv100/clk_gv100.o \
@@ -361,7 +362,6 @@ nvgpu-y += \
 	tu104/sec2_tu104.o \
 	tu104/ecc_tu104.o \
 	tu104/regops_tu104.o \
-	tu104/acr_tu104.o \
 	pstate/pstate.o \
 	clk/clk_vin.o \
 	clk/clk_fll.o \

drivers/gpu/nvgpu/Makefile.sources

@@ -114,6 +114,16 @@ srcs :=	os/posix/nvgpu.c \
 	common/pmu/pmu_pg.c \
 	common/pmu/pmu_perfmon.c \
 	common/pmu/pmu_debug.c \
+	common/pmu/pmu_gk20a.c \
+	common/pmu/pmu_gm20b.c \
+	common/pmu/pmu_gp10b.c \
+	common/pmu/pmu_gp106.c \
+	common/pmu/pmu_gv11b.c \
+	common/pmu/pmu_gv100.c \
+	common/pmu/acr_gm20b.c \
+	common/pmu/acr_gp106.c \
+	common/pmu/acr_gv11b.c \
+	common/pmu/acr_tu104.c \
 	common/sec2/sec2.c \
 	common/sec2/sec2_ipc.c \
 	common/ptimer/ptimer.c \
@@ -171,22 +181,18 @@ srcs :=	os/posix/nvgpu.c \
 	gk20a/regops_gk20a.c \
 	gk20a/gr_gk20a.c \
 	gk20a/mm_gk20a.c \
-	gk20a/pmu_gk20a.c \
 	gk20a/flcn_gk20a.c \
 	gk20a/fence_gk20a.c \
 	gm20b/hal_gm20b.c \
 	gm20b/gr_gm20b.c \
 	gm20b/clk_gm20b.c \
 	gm20b/fifo_gm20b.c \
-	gm20b/acr_gm20b.c \
-	gm20b/pmu_gm20b.c \
 	gm20b/mm_gm20b.c \
 	gm20b/regops_gm20b.c \
 	gp10b/gr_gp10b.c  \
 	gp10b/ce_gp10b.c \
 	gp10b/fifo_gp10b.c  \
 	gp10b/mm_gp10b.c \
-	gp10b/pmu_gp10b.c \
 	gp10b/hal_gp10b.c \
 	gp10b/regops_gp10b.c \
 	gp10b/clk_arb_gp10b.c \
@@ -199,17 +205,13 @@ srcs :=	os/posix/nvgpu.c \
 	gv11b/fifo_gv11b.c \
 	gv11b/mm_gv11b.c \
 	gv11b/ce_gv11b.c \
-	gv11b/pmu_gv11b.c \
-	gv11b/acr_gv11b.c \
 	gv11b/subctx_gv11b.c \
 	gv11b/regops_gv11b.c \
 	gv11b/ecc_gv11b.c \
 	gp106/hal_gp106.c \
 	gp106/flcn_gp106.c \
-	gp106/pmu_gp106.c \
 	gp106/mclk_gp106.c \
 	gp106/gr_gp106.c \
-	gp106/acr_gp106.c \
 	gp106/sec2_gp106.c \
 	gp106/fifo_gp106.c \
 	gp106/regops_gp106.c \
@@ -224,7 +226,6 @@ srcs :=	os/posix/nvgpu.c \
 	gv100/flcn_gv100.c \
 	gv100/nvlink_gv100.c \
 	gv100/hal_gv100.c \
-	gv100/pmu_gv100.c \
 	gv100/perf_gv100.c \
 	gv100/gsp_gv100.c \
 	gv100/clk_gv100.c \
@@ -242,5 +243,4 @@ srcs :=	os/posix/nvgpu.c \
 	tu104/nvlink_tu104.c	\
 	tu104/sec2_tu104.c	\
 	tu104/func_tu104.c	\
-	tu104/regops_tu104.c \
+	tu104/regops_tu104.c
-	tu104/acr_tu104.c

drivers/gpu/nvgpu/common/pmu/acr_gm20b.c

@@ -38,7 +38,8 @@
 #include <nvgpu/gk20a.h>
 #include <nvgpu/string.h>
 
-#include "mm_gm20b.h"
+#include "gm20b/mm_gm20b.h"
+
 #include "pmu_gm20b.h"
 #include "acr_gm20b.h"
 

drivers/gpu/nvgpu/common/pmu/acr_gp106.c

@@ -34,13 +34,13 @@
 #include <nvgpu/string.h>
 
 #include "gm20b/mm_gm20b.h"
-#include "gm20b/acr_gm20b.h"
+#include "gp106/sec2_gp106.h"
-#include "gp106/acr_gp106.h"
-#include "gp106/pmu_gp106.h"
-#include "gv100/acr_gv100.h"
-#include "tu104/acr_tu104.h"
 
-#include "sec2_gp106.h"
+#include "acr_gm20b.h"
+#include "acr_gp106.h"
+#include "pmu_gp106.h"
+#include "acr_gv100.h"
+#include "acr_tu104.h"
 
 #include <nvgpu/hw/gp106/hw_psec_gp106.h>
 #include <nvgpu/hw/gp106/hw_pwr_gp106.h>

drivers/gpu/nvgpu/common/pmu/acr_gv11b.c

@@ -35,12 +35,13 @@
 #include <nvgpu/utils.h>
 #include <nvgpu/gk20a.h>
 
+#include "gm20b/mm_gm20b.h"
+
 #include "acr_gv11b.h"
 #include "pmu_gv11b.h"
-#include "gm20b/mm_gm20b.h"
+#include "pmu_gm20b.h"
-#include "gm20b/pmu_gm20b.h"
+#include "acr_gm20b.h"
-#include "gm20b/acr_gm20b.h"
+#include "acr_gp106.h"
-#include "gp106/acr_gp106.h"
 
 #include <nvgpu/hw/gv11b/hw_pwr_gv11b.h>
 

drivers/gpu/nvgpu/common/pmu/acr_tu104.c

@@ -30,12 +30,13 @@
 #include <nvgpu/dma.h>
 #include <nvgpu/gk20a.h>
 
-#include "gm20b/acr_gm20b.h"
-#include "gp106/acr_gp106.h"
 #include "gv100/gsp_gv100.h"
-#include "tu104/acr_tu104.h"
 #include "tu104/sec2_tu104.h"
 
+#include "acr_gm20b.h"
+#include "acr_gp106.h"
+#include "acr_tu104.h"
+
 static int tu104_bootstrap_hs_acr(struct gk20a *g, struct nvgpu_acr *acr,
 	struct hs_acr *acr_type)
 {

drivers/gpu/nvgpu/common/pmu/pmu_gk20a.c

@@ -37,7 +37,7 @@
 #include <nvgpu/utils.h>
 #include <nvgpu/unit.h>
 
-#include "gr_gk20a.h"
+#include "gk20a/gr_gk20a.h"
 #include "pmu_gk20a.h"
 
 #include <nvgpu/hw/gk20a/hw_mc_gk20a.h>

drivers/gpu/nvgpu/common/pmu/pmu_gm20b.c

@@ -29,8 +29,7 @@
 #include <nvgpu/io.h>
 #include <nvgpu/gk20a.h>
 
-#include "gk20a/pmu_gk20a.h"
+#include "pmu_gk20a.h"
-
 #include "acr_gm20b.h"
 #include "pmu_gm20b.h"
 

drivers/gpu/nvgpu/common/pmu/pmu_gp106.c

@@ -26,13 +26,12 @@
 #include <nvgpu/clk_arb.h>
 #include <nvgpu/gk20a.h>
 
-#include "gk20a/pmu_gk20a.h"
+#include "pmu_gk20a.h"
-
+#include "acr_gm20b.h"
-#include "gm20b/acr_gm20b.h"
+#include "pmu_gm20b.h"
-#include "gm20b/pmu_gm20b.h"
+#include "pmu_gp10b.h"
-#include "gp10b/pmu_gp10b.h"
+#include "pmu_gp106.h"
-#include "gp106/pmu_gp106.h"
+#include "acr_gp106.h"
-#include "gp106/acr_gp106.h"
 
 #include "clk/clk_mclk.h"
 

drivers/gpu/nvgpu/common/pmu/pmu_gp10b.c

@@ -29,10 +29,9 @@
 #include <nvgpu/io.h>
 #include <nvgpu/gk20a.h>
 
-#include "gk20a/pmu_gk20a.h"
+#include "acr_gm20b.h"
-#include "gm20b/acr_gm20b.h"
+#include "pmu_gk20a.h"
-#include "gm20b/pmu_gm20b.h"
+#include "pmu_gm20b.h"
-
 #include "pmu_gp10b.h"
 
 #include <nvgpu/hw/gp10b/hw_pwr_gp10b.h>

drivers/gpu/nvgpu/common/pmu/pmu_gv100.c

@@ -25,7 +25,7 @@
 #include <nvgpu/pmu.h>
 #include <nvgpu/gk20a.h>
 
-#include "gv100/pmu_gv100.h"
+#include "pmu_gv100.h"
 
 int gv100_pmu_init_acr(struct gk20a *g)
 {

drivers/gpu/nvgpu/common/pmu/pmu_gv11b.c

@@ -30,9 +30,8 @@
 #include <nvgpu/utils.h>
 #include <nvgpu/gk20a.h>
 
-#include "gp10b/pmu_gp10b.h"
+#include "pmu_gp10b.h"
-#include "gp106/pmu_gp106.h"
+#include "pmu_gp106.h"
-
 #include "pmu_gv11b.h"
 #include "acr_gv11b.h"
 

drivers/gpu/nvgpu/gm20b/gr_gm20b.c

@@ -35,7 +35,6 @@
 #include "gk20a/gr_gk20a.h"
 
 #include "gr_gm20b.h"
-#include "pmu_gm20b.h"
 
 #include <nvgpu/hw/gm20b/hw_gr_gm20b.h>
 #include <nvgpu/hw/gm20b/hw_fifo_gm20b.h>

drivers/gpu/nvgpu/gm20b/hal_gm20b.c

@@ -45,23 +45,23 @@
 #include "common/fuse/fuse_gm20b.h"
 #include "common/mc/mc_gm20b.h"
 #include "common/perf/perf_gm20b.h"
+#include "common/pmu/pmu_gk20a.h"
+#include "common/pmu/pmu_gm20b.h"
+#include "common/pmu/acr_gm20b.h"
 
 #include "gk20a/ce2_gk20a.h"
 #include "gk20a/fifo_gk20a.h"
 #include "gk20a/mm_gk20a.h"
 #include "gk20a/flcn_gk20a.h"
 #include "gk20a/regops_gk20a.h"
-#include "gk20a/pmu_gk20a.h"
 #include "gk20a/gr_gk20a.h"
 
 #include "gr_gm20b.h"
 #include "fifo_gm20b.h"
 #include "mm_gm20b.h"
-#include "pmu_gm20b.h"
 #include "clk_gm20b.h"
 #include "regops_gm20b.h"
 #include "hal_gm20b.h"
-#include "acr_gm20b.h"
 
 #include <nvgpu/hw/gm20b/hw_proj_gm20b.h>
 #include <nvgpu/hw/gm20b/hw_fifo_gm20b.h>

drivers/gpu/nvgpu/gp106/hal_gp106.c

@@ -44,13 +44,18 @@
 #include "common/mc/mc_gm20b.h"
 #include "common/mc/mc_gp10b.h"
 #include "common/perf/perf_gm20b.h"
+#include "common/pmu/pmu_gk20a.h"
+#include "common/pmu/pmu_gm20b.h"
+#include "common/pmu/pmu_gp10b.h"
+#include "common/pmu/pmu_gp106.h"
+#include "common/pmu/acr_gm20b.h"
+#include "common/pmu/acr_gp106.h"
 
 #include "gk20a/fifo_gk20a.h"
 #include "gk20a/fecs_trace_gk20a.h"
 #include "gk20a/mm_gk20a.h"
 #include "gk20a/flcn_gk20a.h"
 #include "gk20a/regops_gk20a.h"
-#include "gk20a/pmu_gk20a.h"
 #include "gk20a/gr_gk20a.h"
 
 #include "gp10b/gr_gp10b.h"
@@ -59,7 +64,6 @@
 #include "gp10b/ce_gp10b.h"
 #include "gp10b/regops_gp10b.h"
 #include "gp10b/fifo_gp10b.h"
-#include "gp10b/pmu_gp10b.h"
 #include "gp10b/gr_gp10b.h"
 
 #include "gp106/fifo_gp106.h"
@@ -68,11 +72,8 @@
 #include "gm20b/gr_gm20b.h"
 #include "gm20b/fifo_gm20b.h"
 #include "gm20b/mm_gm20b.h"
-#include "gm20b/pmu_gm20b.h"
-#include "gm20b/acr_gm20b.h"
 #include "gm20b/gr_gm20b.h"
 
-#include "gp106/acr_gp106.h"
 #include "gp106/sec2_gp106.h"
 #include "gp106/clk_gp106.h"
 #include "gp106/clk_arb_gp106.h"
@@ -80,7 +81,6 @@
 #include "gp106/bios_gp106.h"
 #include "gp106/fifo_gp106.h"
 #include "gp106/clk_gp106.h"
-#include "gp106/pmu_gp106.h"
 #include "gp106/gr_gp106.h"
 #include "gp106/flcn_gp106.h"
 

drivers/gpu/nvgpu/gp10b/hal_gp10b.c

@@ -53,20 +53,22 @@
 #include "common/mc/mc_gm20b.h"
 #include "common/mc/mc_gp10b.h"
 #include "common/perf/perf_gm20b.h"
+#include "common/pmu/pmu_gk20a.h"
+#include "common/pmu/pmu_gm20b.h"
+#include "common/pmu/pmu_gp10b.h"
+#include "common/pmu/acr_gm20b.h"
 
 #include "gk20a/fifo_gk20a.h"
 #include "gk20a/fecs_trace_gk20a.h"
 #include "gk20a/mm_gk20a.h"
 #include "gk20a/flcn_gk20a.h"
 #include "gk20a/regops_gk20a.h"
-#include "gk20a/pmu_gk20a.h"
 #include "gk20a/gr_gk20a.h"
 
 #include "gp10b/gr_gp10b.h"
 #include "gp10b/fecs_trace_gp10b.h"
 #include "gp10b/mm_gp10b.h"
 #include "gp10b/ce_gp10b.h"
-#include "gp10b/pmu_gp10b.h"
 #include "gp10b/fifo_gp10b.h"
 #include "gp10b/regops_gp10b.h"
 #include "gp10b/ecc_gp10b.h"
@@ -74,8 +76,6 @@
 
 #include "gm20b/gr_gm20b.h"
 #include "gm20b/fifo_gm20b.h"
-#include "gm20b/acr_gm20b.h"
-#include "gm20b/pmu_gm20b.h"
 #include "gm20b/clk_gm20b.h"
 #include "gm20b/mm_gm20b.h"
 

drivers/gpu/nvgpu/gv100/hal_gv100.c

@@ -52,24 +52,27 @@
 #include "common/mc/mc_gv11b.h"
 #include "common/mc/mc_gv100.h"
 #include "common/perf/perf_gv11b.h"
+#include "common/pmu/pmu_gk20a.h"
+#include "common/pmu/pmu_gm20b.h"
+#include "common/pmu/pmu_gp10b.h"
+#include "common/pmu/pmu_gp106.h"
+#include "common/pmu/acr_gm20b.h"
+#include "common/pmu/acr_gp106.h"
+#include "common/pmu/pmu_gv11b.h"
+#include "common/pmu/pmu_gv100.h"
 
 #include "gk20a/fifo_gk20a.h"
 #include "gk20a/fecs_trace_gk20a.h"
 #include "gk20a/flcn_gk20a.h"
 #include "gk20a/regops_gk20a.h"
 #include "gk20a/mm_gk20a.h"
-#include "gk20a/pmu_gk20a.h"
 #include "gk20a/gr_gk20a.h"
 
 #include "gm20b/gr_gm20b.h"
 #include "gm20b/fifo_gm20b.h"
 #include "gm20b/mm_gm20b.h"
-#include "gm20b/pmu_gm20b.h"
-#include "gm20b/acr_gm20b.h"
 
 #include "gp106/clk_arb_gp106.h"
-#include "gp106/pmu_gp106.h"
-#include "gp106/acr_gp106.h"
 #include "gp106/sec2_gp106.h"
 #include "gp106/bios_gp106.h"
 #include "gp106/flcn_gp106.h"
@@ -79,15 +82,12 @@
 #include "gp10b/fifo_gp10b.h"
 #include "gp10b/fecs_trace_gp10b.h"
 #include "gp10b/mm_gp10b.h"
-#include "gp10b/pmu_gp10b.h"
 
 #include "gv11b/hal_gv11b.h"
 #include "gv11b/gr_gv11b.h"
 #include "gv11b/gv11b.h"
 #include "gv11b/ce_gv11b.h"
 #include "gv11b/mm_gv11b.h"
-#include "gv11b/pmu_gv11b.h"
-#include "gv11b/pmu_gv11b.h"
 #include "gv11b/fifo_gv11b.h"
 #include "gv11b/regops_gv11b.h"
 #include "gv11b/subctx_gv11b.h"
@@ -99,7 +99,6 @@
 #include "gv100/flcn_gv100.h"
 #include "gv100/gr_gv100.h"
 #include "gv100/mm_gv100.h"
-#include "gv100/pmu_gv100.h"
 #include "gv100/nvlink_gv100.h"
 #include "gv100/regops_gv100.h"
 #include "gv100/perf_gv100.h"

drivers/gpu/nvgpu/gv11b/hal_gv11b.c

@@ -46,31 +46,33 @@
 #include "common/mc/mc_gp10b.h"
 #include "common/mc/mc_gv11b.h"
 #include "common/perf/perf_gv11b.h"
+#include "common/pmu/pmu_gk20a.h"
+#include "common/pmu/pmu_gm20b.h"
+#include "common/pmu/pmu_gp10b.h"
+#include "common/pmu/pmu_gp106.h"
+#include "common/pmu/pmu_gv11b.h"
+#include "common/pmu/acr_gm20b.h"
+#include "common/pmu/acr_gp106.h"
+#include "common/pmu/acr_gv11b.h"
 
 #include "gk20a/fifo_gk20a.h"
 #include "gk20a/fecs_trace_gk20a.h"
 #include "gk20a/mm_gk20a.h"
 #include "gk20a/flcn_gk20a.h"
 #include "gk20a/regops_gk20a.h"
-#include "gk20a/pmu_gk20a.h"
 #include "gk20a/gr_gk20a.h"
 
 #include "gm20b/gr_gm20b.h"
 #include "gm20b/fifo_gm20b.h"
 #include "gm20b/mm_gm20b.h"
-#include "gm20b/acr_gm20b.h"
-#include "gm20b/pmu_gm20b.h"
 
 #include "gp10b/ce_gp10b.h"
 #include "gp10b/fifo_gp10b.h"
 #include "gp10b/fecs_trace_gp10b.h"
 #include "gp10b/mm_gp10b.h"
-#include "gp10b/pmu_gp10b.h"
 #include "gp10b/gr_gp10b.h"
 #include "gp10b/clk_arb_gp10b.h"
 
-#include "gp106/pmu_gp106.h"
-#include "gp106/acr_gp106.h"
 
 #include "gv100/gr_gv100.h"
 
@@ -79,8 +81,6 @@
 #include "gv11b.h"
 #include "ce_gv11b.h"
 #include "mm_gv11b.h"
-#include "pmu_gv11b.h"
-#include "acr_gv11b.h"
 #include "fifo_gv11b.h"
 #include "regops_gv11b.h"
 #include "subctx_gv11b.h"

drivers/gpu/nvgpu/tu104/hal_tu104.c

@@ -55,25 +55,29 @@
 #include "common/mc/mc_gv100.h"
 #include "common/mc/mc_tu104.h"
 #include "common/perf/perf_gv11b.h"
+#include "common/pmu/pmu_gk20a.h"
+#include "common/pmu/pmu_gm20b.h"
+#include "common/pmu/pmu_gp10b.h"
+#include "common/pmu/pmu_gp106.h"
+#include "common/pmu/pmu_gv100.h"
+#include "common/pmu/pmu_gv11b.h"
+#include "common/pmu/acr_gm20b.h"
+#include "common/pmu/acr_gp106.h"
+#include "common/pmu/acr_tu104.h"
 
 #include "gk20a/fifo_gk20a.h"
 #include "gk20a/fecs_trace_gk20a.h"
 #include "gk20a/flcn_gk20a.h"
 #include "gk20a/regops_gk20a.h"
 #include "gk20a/mm_gk20a.h"
-#include "gk20a/pmu_gk20a.h"
 #include "gk20a/gr_gk20a.h"
 
 #include "gm20b/gr_gm20b.h"
 #include "gm20b/fifo_gm20b.h"
 #include "gm20b/mm_gm20b.h"
-#include "gm20b/pmu_gm20b.h"
-#include "gm20b/acr_gm20b.h"
 
 #include "gv100/clk_gv100.h"
 #include "gp106/clk_arb_gp106.h"
-#include "gp106/pmu_gp106.h"
-#include "gp106/acr_gp106.h"
 #include "gp106/sec2_gp106.h"
 #include "gp106/bios_gp106.h"
 #include "gp106/flcn_gp106.h"
@@ -83,15 +87,12 @@
 #include "gp10b/fifo_gp10b.h"
 #include "gp10b/fecs_trace_gp10b.h"
 #include "gp10b/mm_gp10b.h"
-#include "gp10b/pmu_gp10b.h"
 
 #include "gv11b/hal_gv11b.h"
 #include "gv11b/gr_gv11b.h"
 #include "gv11b/gv11b.h"
 #include "gv11b/ce_gv11b.h"
 #include "gv11b/mm_gv11b.h"
-#include "gv11b/pmu_gv11b.h"
-#include "gv11b/pmu_gv11b.h"
 #include "gv11b/fifo_gv11b.h"
 #include "gv11b/regops_gv11b.h"
 #include "gv11b/subctx_gv11b.h"
@@ -101,7 +102,6 @@
 #include "gv100/flcn_gv100.h"
 #include "gv100/gr_gv100.h"
 #include "gv100/mm_gv100.h"
-#include "gv100/pmu_gv100.h"
 #include "gv100/nvlink_gv100.h"
 #include "gv100/regops_gv100.h"
 
@@ -115,7 +115,6 @@
 #include "tu104/ecc_tu104.h"
 #include "tu104/hal_tu104.h"
 #include "tu104/regops_tu104.h"
-#include "tu104/acr_tu104.h"
 
 #include <nvgpu/ptimer.h>
 #include <nvgpu/debug.h>

drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c

@@ -55,26 +55,17 @@
 #include "vgpu/gp10b/vgpu_gr_gp10b.h"
 
 #include <gk20a/flcn_gk20a.h>
-#include <gk20a/pmu_gk20a.h>
 
 #include <gm20b/gr_gm20b.h>
 #include <gm20b/fifo_gm20b.h>
-#include <gm20b/pmu_gm20b.h>
 #include <gm20b/mm_gm20b.h>
-#include <gm20b/acr_gm20b.h>
 
-#include <gp10b/pmu_gp10b.h>
 #include <gp10b/mm_gp10b.h>
 #include <gp10b/ce_gp10b.h>
 #include "gp10b/gr_gp10b.h"
 #include <gp10b/fifo_gp10b.h>
 #include "gp10b/clk_arb_gp10b.h"
 
-#include <gp106/pmu_gp106.h>
-#include <gp106/acr_gp106.h>
-
-#include <gv11b/pmu_gv11b.h>
-#include <gv11b/acr_gv11b.h>
 #include <gv11b/mm_gv11b.h>
 #include <gv11b/ce_gv11b.h>
 #include <gv11b/fifo_gv11b.h>