gpu: nvgpu: Move gp10b HW headers

Move the gp10b HW headers to a new directory specially for them:

  include/nvgpu/hw/gp10b

And change the code to include like so:

  #include <nvgpu/hw/gp10b/hw_fb_gp10b.h>

This is part of the process to restructure the nvgpu driver.

Bug 1799159

Change-Id: Ic80ea5b7f5c280839e502e2178a345181f7a7ef9
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1280326
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

40 files changed, 78 insertions, 48 deletions

diff --git a/drivers/gpu/nvgpu/gp10b/ce_gp10b.c b/drivers/gpu/nvgpu/gp10b/ce_gp10b.c
index e5082778..f19a4b0f 100644
--- a/drivers/gpu/nvgpu/gp10b/ce_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/ce_gp10b.c
@@ -16,10 +16,12 @@
  * this program.
  */
 
-#include "gk20a/gk20a.h" /* FERMI and MAXWELL classes defined here */
-#include "hw_ce_gp10b.h"
+#include "gk20a/gk20a.h"
+
 #include "ce_gp10b.h"
 
+#include <nvgpu/hw/gp10b/hw_ce_gp10b.h>
+
 static void ce_nonblockpipe_isr(struct gk20a *g, u32 fifo_intr)
 {
         gk20a_dbg(gpu_dbg_intr, "ce non-blocking pipe interrupt\n");
diff --git a/drivers/gpu/nvgpu/gp10b/fb_gp10b.c b/drivers/gpu/nvgpu/gp10b/fb_gp10b.c
index 5324b5ef..db4716f3 100644
--- a/drivers/gpu/nvgpu/gp10b/fb_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/fb_gp10b.c
@@ -19,7 +19,7 @@
 #include "gm20b/fb_gm20b.h"
 #include "gk20a/kind_gk20a.h"
 
-#include "hw_gmmu_gp10b.h"
+#include <nvgpu/hw/gp10b/hw_gmmu_gp10b.h>
 
 static void gp10b_init_uncompressed_kind_map(void)
 {
diff --git a/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.c b/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.c
index 7dd200a9..d9e7e7bf 100644
--- a/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.c
@@ -15,8 +15,9 @@
 
 #include "gk20a/gk20a.h"
 #include "gk20a/fecs_trace_gk20a.h"
-#include "gp10b/hw_ctxsw_prog_gp10b.h"
-#include "gp10b/hw_gr_gp10b.h"
+
+#include <nvgpu/hw/gp10b/hw_ctxsw_prog_gp10b.h>
+#include <nvgpu/hw/gp10b/hw_gr_gp10b.h>
 
 #ifdef CONFIG_GK20A_CTXSW_TRACE
 static int gp10b_fecs_trace_flush(struct gk20a *g)
diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
index 40bfa2a5..d5c5327f 100644
--- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
@@ -16,14 +16,16 @@
 #include <linux/delay.h>
 #include <linux/types.h>
 
+#include "fifo_gp10b.h"
+
 #include "gk20a/gk20a.h"
 #include "gm20b/fifo_gm20b.h"
-#include "hw_pbdma_gp10b.h"
-#include "fifo_gp10b.h"
-#include "hw_ccsr_gp10b.h"
-#include "hw_fifo_gp10b.h"
-#include "hw_ram_gp10b.h"
-#include "hw_top_gp10b.h"
+
+#include <nvgpu/hw/gp10b/hw_pbdma_gp10b.h>
+#include <nvgpu/hw/gp10b/hw_ccsr_gp10b.h>
+#include <nvgpu/hw/gp10b/hw_fifo_gp10b.h>
+#include <nvgpu/hw/gp10b/hw_ram_gp10b.h>
+#include <nvgpu/hw/gp10b/hw_top_gp10b.h>
 
 static void gp10b_set_pdb_fault_replay_flags(struct gk20a *g,
                                 struct mem_desc *mem)
@@ -145,7 +147,7 @@ static int channel_gp10b_setup_ramfc(struct channel_gk20a *c,
 
 static u32 gp10b_fifo_get_pbdma_signature(struct gk20a *g)
 {
-        return g->gpu_characteristics.gpfifo_class 
+        return g->gpu_characteristics.gpfifo_class
                 | pbdma_signature_sw_zero_f();
 }
 
diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.h b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.h
index 3ef8247f..da0e82a9 100644
--- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.h
+++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.h
@@ -15,7 +15,11 @@
 
 #ifndef FIFO_GP10B_H
 #define FIFO_GP10B_H
+
 struct gpu_ops;
+struct channel_gk20a;
+
 void gp10b_init_fifo(struct gpu_ops *gops);
 int channel_gp10b_commit_userd(struct channel_gk20a *c);
+
 #endif
diff --git a/drivers/gpu/nvgpu/gp10b/gp10b.c b/drivers/gpu/nvgpu/gp10b/gp10b.c
index a541dda3..e2e27258 100644
--- a/drivers/gpu/nvgpu/gp10b/gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/gp10b.c
@@ -17,8 +17,9 @@
  */
 
 #include "gk20a/gk20a.h"
-#include "hw_fuse_gp10b.h"
-#include "hw_gr_gp10b.h"
+
+#include <nvgpu/hw/gp10b/hw_fuse_gp10b.h>
+#include <nvgpu/hw/gp10b/hw_gr_gp10b.h>
 
 static u64 gp10b_detect_ecc_enabled_units(struct gk20a *g)
 {
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
index 45820c5c..93d7dcbd 100644
--- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
@@ -13,27 +13,28 @@
  * more details.
  */
 
-#include "gk20a/gk20a.h" /* FERMI and MAXWELL classes defined here */
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/tegra-fuse.h>
 #include <linux/version.h>
+#include <linux/vmalloc.h>
 
 #include <dt-bindings/soc/gm20b-fuse.h>
 #include <dt-bindings/soc/gp10b-fuse.h>
 
+#include "gk20a/gk20a.h"
 #include "gk20a/gr_gk20a.h"
 #include "gk20a/semaphore_gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
 
-#include "gm20b/gr_gm20b.h" /* for MAXWELL classes */
+#include "gm20b/gr_gm20b.h"
 #include "gp10b/gr_gp10b.h"
-#include "hw_gr_gp10b.h"
-#include "hw_fifo_gp10b.h"
-#include "hw_ctxsw_prog_gp10b.h"
-#include "hw_mc_gp10b.h"
 #include "gp10b_sysfs.h"
-#include <linux/vmalloc.h>
+
+#include <nvgpu/hw/gp10b/hw_gr_gp10b.h>
+#include <nvgpu/hw/gp10b/hw_fifo_gp10b.h>
+#include <nvgpu/hw/gp10b/hw_ctxsw_prog_gp10b.h>
+#include <nvgpu/hw/gp10b/hw_mc_gp10b.h>
 
 #define NVGPU_GFXP_WFI_TIMEOUT_US       100LL
 
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
index a656f10d..d6379374 100644
--- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
@@ -16,10 +16,12 @@
 #include <linux/types.h>
 #include <linux/printk.h>
 #include <linux/version.h>
-
 #include <linux/types.h>
+#include <linux/tegra-fuse.h>
 
 #include "gk20a/gk20a.h"
+#include "gk20a/dbg_gpu_gk20a.h"
+#include "gk20a/css_gr_gk20a.h"
 
 #include "gp10b/gr_gp10b.h"
 #include "gp10b/fecs_trace_gp10b.h"
@@ -40,12 +42,10 @@
 #include "gm20b/fifo_gm20b.h"
 #include "gm20b/pmu_gm20b.h"
 #include "gm20b/clk_gm20b.h"
-#include <linux/tegra-fuse.h>
 
 #include "gp10b.h"
-#include "hw_proj_gp10b.h"
-#include "gk20a/dbg_gpu_gk20a.h"
-#include "gk20a/css_gr_gk20a.h"
+
+#include <nvgpu/hw/gp10b/hw_proj_gp10b.h>
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0)
 #define FUSE_OPT_PRIV_SEC_EN_0 0x264
diff --git a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c
index 31c79aff..c429bcc2 100644
--- a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c
@@ -19,8 +19,9 @@
 
 #include "gk20a/gk20a.h"
 #include "gm20b/ltc_gm20b.h"
-#include "hw_mc_gp10b.h"
-#include "hw_ltc_gp10b.h"
+
+#include <nvgpu/hw/gp10b/hw_mc_gp10b.h>
+#include <nvgpu/hw/gp10b/hw_ltc_gp10b.h>
 
 #include "gk20a/ltc_common.c"
 
diff --git a/drivers/gpu/nvgpu/gp10b/mc_gp10b.c b/drivers/gpu/nvgpu/gp10b/mc_gp10b.c
index eda961b6..76848159 100644
--- a/drivers/gpu/nvgpu/gp10b/mc_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/mc_gp10b.c
@@ -16,8 +16,10 @@
 #include <linux/types.h>
 
 #include "gk20a/gk20a.h"
+
 #include "mc_gp10b.h"
-#include "hw_mc_gp10b.h"
+
+#include <nvgpu/hw/gp10b/hw_mc_gp10b.h>
 
 void mc_gp10b_intr_enable(struct gk20a *g)
 {
diff --git a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c
index 1b6b6641..835d33f3 100644
--- a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c
@@ -15,14 +15,17 @@
 
 #include <linux/pm_runtime.h>
 #include <linux/dma-mapping.h>
+
 #include "gk20a/gk20a.h"
+#include "gk20a/semaphore_gk20a.h"
+
 #include "mm_gp10b.h"
 #include "rpfb_gp10b.h"
-#include "hw_fb_gp10b.h"
-#include "hw_ram_gp10b.h"
-#include "hw_bus_gp10b.h"
-#include "hw_gmmu_gp10b.h"
-#include "gk20a/semaphore_gk20a.h"
+
+#include <nvgpu/hw/gp10b/hw_fb_gp10b.h>
+#include <nvgpu/hw/gp10b/hw_ram_gp10b.h>
+#include <nvgpu/hw/gp10b/hw_bus_gp10b.h>
+#include <nvgpu/hw/gp10b/hw_gmmu_gp10b.h>
 
 static u32 gp10b_mm_get_physical_addr_bits(struct gk20a *g)
 {
diff --git a/drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c b/drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c
index 9fabe1f5..c198f9f1 100644
--- a/drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c
+++ b/drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c
@@ -18,22 +18,28 @@
 #include <linux/debugfs.h>
 #include <linux/tegra-powergate.h>
 #include <linux/platform_data/tegra_edp.h>
-#include <uapi/linux/nvgpu.h>
 #include <linux/dma-buf.h>
 #include <linux/nvmap.h>
 #include <linux/reset.h>
-#include <soc/tegra/tegra_bpmp.h>
 #include <linux/hashtable.h>
+
+#include <linux/platform/tegra/emc_bwmgr.h>
+
+#include <uapi/linux/nvgpu.h>
+
+#include <soc/tegra/tegra_bpmp.h>
+
 #include "gk20a/platform_gk20a.h"
 #include "gk20a/gk20a.h"
 #include "gk20a/gk20a_scale.h"
+
 #include "platform_tegra.h"
 #include "gr_gp10b.h"
 #include "ltc_gp10b.h"
-#include "hw_gr_gp10b.h"
-#include "hw_ltc_gp10b.h"
 #include "gp10b_sysfs.h"
-#include <linux/platform/tegra/emc_bwmgr.h>
+
+#include <nvgpu/hw/gp10b/hw_gr_gp10b.h>
+#include <nvgpu/hw/gp10b/hw_ltc_gp10b.h>
 
 /* Select every GP10B_FREQ_SELECT_STEP'th frequency from h/w table */
 #define GP10B_FREQ_SELECT_STEP  8
diff --git a/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c b/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c
index cf702ac6..fc535985 100644
--- a/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c
@@ -15,16 +15,18 @@
 
 #include <linux/delay.h>        /* for udelay */
 #include <linux/tegra-fuse.h>
+
 #include "gk20a/gk20a.h"
 #include "gk20a/pmu_gk20a.h"
 #include "gm20b/acr_gm20b.h"
 #include "gm20b/pmu_gm20b.h"
 
 #include "pmu_gp10b.h"
-#include "hw_pwr_gp10b.h"
-#include "hw_fuse_gp10b.h"
 #include "gp10b_sysfs.h"
 
+#include <nvgpu/hw/gp10b/hw_pwr_gp10b.h>
+#include <nvgpu/hw/gp10b/hw_fuse_gp10b.h>
+
 #define gp10b_dbg_pmu(fmt, arg...) \
         gk20a_dbg(gpu_dbg_pmu, fmt, ##arg)
 /*!
diff --git a/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c b/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c
index f88718b6..e73bcd8f 100644
--- a/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c
@@ -15,12 +15,15 @@
 
 #include <linux/pm_runtime.h>
 #include <linux/dma-mapping.h>
+
 #include "gk20a/gk20a.h"
+
 #include "rpfb_gp10b.h"
-#include "hw_fifo_gp10b.h"
-#include "hw_fb_gp10b.h"
-#include "hw_bus_gp10b.h"
-#include "hw_gmmu_gp10b.h"
+
+#include <nvgpu/hw/gp10b/hw_fifo_gp10b.h>
+#include <nvgpu/hw/gp10b/hw_fb_gp10b.h>
+#include <nvgpu/hw/gp10b/hw_bus_gp10b.h>
+#include <nvgpu/hw/gp10b/hw_gmmu_gp10b.h>
 
 int gp10b_replayable_pagefault_buffer_init(struct gk20a *g)
 {
diff --git a/drivers/gpu/nvgpu/gp10b/therm_gp10b.c b/drivers/gpu/nvgpu/gp10b/therm_gp10b.c
index 7f43cb56..4b346313 100644
--- a/drivers/gpu/nvgpu/gp10b/therm_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/therm_gp10b.c
@@ -16,7 +16,8 @@
  */
 
 #include "gk20a/gk20a.h"
-#include "hw_therm_gp10b.h"
+
+#include <nvgpu/hw/gp10b/hw_therm_gp10b.h>
 
 static int gp10b_init_therm_setup_hw(struct gk20a *g)
 {
diff --git a/drivers/gpu/nvgpu/gp10b/hw_bus_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_bus_gp10b.h
index 02c06610..02c06610 100644
--- a/drivers/gpu/nvgpu/gp10b/hw_bus_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_bus_gp10b.h
diff --git a/drivers/gpu/nvgpu/gp10b/hw_ccsr_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_ccsr_gp10b.h
index 99398961..99398961 100644
--- a/drivers/gpu/nvgpu/gp10b/hw_ccsr_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_ccsr_gp10b.h
diff --git a/drivers/gpu/nvgpu/gp10b/hw_ce_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_ce_gp10b.h
index 3f6e1470..3f6e1470 100644
--- a/drivers/gpu/nvgpu/gp10b/hw_ce_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_ce_gp10b.h
diff --git a/drivers/gpu/nvgpu/gp10b/hw_chiplet_pwr_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_chiplet_pwr_gp10b.h
index 640453ce..640453ce 100644
--- a/drivers/gpu/nvgpu/gp10b/hw_chiplet_pwr_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_chiplet_pwr_gp10b.h
diff --git a/drivers/gpu/nvgpu/gp10b/hw_ctxsw_prog_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_ctxsw_prog_gp10b.h
index eef9a96f..eef9a96f 100644
--- a/drivers/gpu/nvgpu/gp10b/hw_ctxsw_prog_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_ctxsw_prog_gp10b.h
diff --git a/drivers/gpu/nvgpu/gp10b/hw_fb_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fb_gp10b.h
index ec340777..ec340777 100644
--- a/drivers/gpu/nvgpu/gp10b/hw_fb_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fb_gp10b.h
diff --git a/drivers/gpu/nvgpu/gp10b/hw_fifo_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fifo_gp10b.h
index 8370d4c6..8370d4c6 100644
--- a/drivers/gpu/nvgpu/gp10b/hw_fifo_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fifo_gp10b.h
diff --git a/drivers/gpu/nvgpu/gp10b/hw_flush_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_flush_gp10b.h
index e2dff490..e2dff490 100644
--- a/drivers/gpu/nvgpu/gp10b/hw_flush_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_flush_gp10b.h
diff --git a/drivers/gpu/nvgpu/gp10b/hw_fuse_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fuse_gp10b.h
index 2b1acf2f..2b1acf2f 100644
--- a/drivers/gpu/nvgpu/gp10b/hw_fuse_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fuse_gp10b.h
diff --git a/drivers/gpu/nvgpu/gp10b/hw_gmmu_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gmmu_gp10b.h
index d231ee44..d231ee44 100644
--- a/drivers/gpu/nvgpu/gp10b/hw_gmmu_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gmmu_gp10b.h
diff --git a/drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gr_gp10b.h
index 9e3137e7..9e3137e7 100644
--- a/drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gr_gp10b.h
diff --git a/drivers/gpu/nvgpu/gp10b/hw_ltc_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_ltc_gp10b.h
index 4a3f634e..4a3f634e 100644
--- a/drivers/gpu/nvgpu/gp10b/hw_ltc_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_ltc_gp10b.h
diff --git a/drivers/gpu/nvgpu/gp10b/hw_mc_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_mc_gp10b.h
index 30165e66..30165e66 100644
--- a/drivers/gpu/nvgpu/gp10b/hw_mc_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_mc_gp10b.h
diff --git a/drivers/gpu/nvgpu/gp10b/hw_pbdma_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pbdma_gp10b.h
index 65aedccd..65aedccd 100644
--- a/drivers/gpu/nvgpu/gp10b/hw_pbdma_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pbdma_gp10b.h
diff --git a/drivers/gpu/nvgpu/gp10b/hw_perf_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_perf_gp10b.h
index ea1a61d2..ea1a61d2 100644
--- a/drivers/gpu/nvgpu/gp10b/hw_perf_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_perf_gp10b.h
diff --git a/drivers/gpu/nvgpu/gp10b/hw_pram_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pram_gp10b.h
index 12a83a71..12a83a71 100644
--- a/drivers/gpu/nvgpu/gp10b/hw_pram_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pram_gp10b.h
diff --git a/drivers/gpu/nvgpu/gp10b/hw_pri_ringmaster_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pri_ringmaster_gp10b.h
index 7a458858..7a458858 100644
--- a/drivers/gpu/nvgpu/gp10b/hw_pri_ringmaster_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pri_ringmaster_gp10b.h
diff --git a/drivers/gpu/nvgpu/gp10b/hw_pri_ringstation_sys_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pri_ringstation_sys_gp10b.h
index eb711452..eb711452 100644
--- a/drivers/gpu/nvgpu/gp10b/hw_pri_ringstation_sys_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pri_ringstation_sys_gp10b.h
diff --git a/drivers/gpu/nvgpu/gp10b/hw_proj_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_proj_gp10b.h
index 3392242c..3392242c 100644
--- a/drivers/gpu/nvgpu/gp10b/hw_proj_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_proj_gp10b.h
diff --git a/drivers/gpu/nvgpu/gp10b/hw_pwr_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pwr_gp10b.h
index 9a3591c7..9a3591c7 100644
--- a/drivers/gpu/nvgpu/gp10b/hw_pwr_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pwr_gp10b.h
diff --git a/drivers/gpu/nvgpu/gp10b/hw_ram_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_ram_gp10b.h
index 89dfbc21..89dfbc21 100644
--- a/drivers/gpu/nvgpu/gp10b/hw_ram_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_ram_gp10b.h
diff --git a/drivers/gpu/nvgpu/gp10b/hw_therm_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_therm_gp10b.h
index 8a587b7c..8a587b7c 100644
--- a/drivers/gpu/nvgpu/gp10b/hw_therm_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_therm_gp10b.h
diff --git a/drivers/gpu/nvgpu/gp10b/hw_timer_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_timer_gp10b.h
index df27154f..df27154f 100644
--- a/drivers/gpu/nvgpu/gp10b/hw_timer_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_timer_gp10b.h
diff --git a/drivers/gpu/nvgpu/gp10b/hw_top_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_top_gp10b.h
index c6645ca0..c6645ca0 100644
--- a/drivers/gpu/nvgpu/gp10b/hw_top_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_top_gp10b.h
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c
index 85dc8c22..6027ba7f 100644
--- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c
+++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c
@@ -12,10 +12,11 @@
  */
 
 #include "vgpu/vgpu.h"
-#include "vgpu_gr_gp10b.h"
 #include "vgpu/gm20b/vgpu_gr_gm20b.h"
 
-#include "gp10b/hw_gr_gp10b.h"
+#include "vgpu_gr_gp10b.h"
+
+#include <nvgpu/hw/gp10b/hw_gr_gp10b.h>
 
 static void vgpu_gr_gp10b_free_gr_ctx(struct gk20a *g, struct vm_gk20a *vm,
                                 struct gr_ctx_desc *gr_ctx)