gpu: nvgpu: Start re-organizing the HW headers

Reorganize the HW headers of gk20a. The headers are moved to a
new directory:

  include/nvgpu/hw/gk20a

And from the code are included like so:

  #include <nvgpu/hw/gk20a/hw_pwr_gk20a.h>

This is the first step in reorganizing all of the HW headers for
gm20b, gm206, etc. This is part of a larger effort to re-structure
and make the driver more readable and scalable.

Bug 1799159

Change-Id: Ic151155cbc2e6f75009f2d9d597b364a1bed2c4c
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1244790
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

57 files changed, 127 insertions, 99 deletions

diff --git a/drivers/gpu/nvgpu/clk/clk_mclk.c b/drivers/gpu/nvgpu/clk/clk_mclk.c
index 06ff9082..cf95f4c5 100644
--- a/drivers/gpu/nvgpu/clk/clk_mclk.c
+++ b/drivers/gpu/nvgpu/clk/clk_mclk.c
@@ -16,7 +16,8 @@
 #include "pmuif/gpmuifseq.h"
 #include "gm206/bios_gm206.h"
 #include "gk20a/pmu_gk20a.h"
-#include "gk20a/hw_pwr_gk20a.h"
+
+#include <nvgpu/hw/gk20a/hw_pwr_gk20a.h>
 #include "gp106/hw_fb_gp106.h"
 
 #include "include/bios.h"
diff --git a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c
index 57b49f2c..e4bb2a57 100644
--- a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c
@@ -34,8 +34,8 @@
 #include "semaphore_gk20a.h"
 #include "nvgpu_common.h"
 
-#include "hw_ccsr_gk20a.h"
-#include "hw_pbdma_gk20a.h"
+#include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h>
 
 static int gk20a_cde_load(struct gk20a_cde_ctx *cde_ctx);
 static struct gk20a_cde_ctx *gk20a_cde_allocate_context(struct gk20a *g);
diff --git a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c
index 235bc027..af49c864 100644
--- a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c
@@ -29,13 +29,14 @@
 #include "gk20a.h"
 #include "debug_gk20a.h"
 #include "semaphore_gk20a.h"
-#include "hw_ce2_gk20a.h"
-#include "hw_pbdma_gk20a.h"
-#include "hw_ccsr_gk20a.h"
-#include "hw_ram_gk20a.h"
-#include "hw_top_gk20a.h"
-#include "hw_mc_gk20a.h"
-#include "hw_gr_gk20a.h"
+
+#include <nvgpu/hw/gk20a/hw_ce2_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_ram_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_top_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_mc_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_gr_gk20a.h>
 
 static u32 ce2_nonblockpipe_isr(struct gk20a *g, u32 fifo_intr)
 {
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index a731e29c..40d6d91c 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -36,11 +36,11 @@
 #include "fence_gk20a.h"
 #include "semaphore_gk20a.h"
 
-#include "hw_ram_gk20a.h"
-#include "hw_fifo_gk20a.h"
-#include "hw_pbdma_gk20a.h"
-#include "hw_ccsr_gk20a.h"
-#include "hw_ltc_gk20a.h"
+#include <nvgpu/hw/gk20a/hw_ram_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_fifo_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_ltc_gk20a.h>
 
 #define NVMAP_HANDLE_PARAM_SIZE 1
 
diff --git a/drivers/gpu/nvgpu/gk20a/clk_gk20a.c b/drivers/gpu/nvgpu/gk20a/clk_gk20a.c
index 34f3f886..32690c90 100644
--- a/drivers/gpu/nvgpu/gk20a/clk_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/clk_gk20a.c
@@ -23,8 +23,9 @@
 #include <linux/clk/tegra.h>
 
 #include "gk20a.h"
-#include "hw_trim_gk20a.h"
-#include "hw_timer_gk20a.h"
+
+#include <nvgpu/hw/gk20a/hw_trim_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_timer_gk20a.h>
 
 #define gk20a_dbg_clk(fmt, arg...) \
         gk20a_dbg(gpu_dbg_clk, fmt, ##arg)
diff --git a/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c
index 71614d6e..aa92796c 100644
--- a/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c
@@ -23,10 +23,11 @@
 #include <linux/vmalloc.h>
 
 #include "gk20a.h"
-#include "hw_perf_gk20a.h"
-#include "hw_mc_gk20a.h"
 #include "css_gr_gk20a.h"
 
+#include <nvgpu/hw/gk20a/hw_perf_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_mc_gk20a.h>
+
 /* check client for pointed perfmon ownership */
 #define CONTAINS_PERFMON(cl, pm)                                \
                 ((cl)->perfmon_start <= (pm) &&                 \
diff --git a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c
index a7f61c8c..26eea610 100644
--- a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c
@@ -27,9 +27,10 @@
 #include "gr_gk20a.h"
 #include "fence_gk20a.h"
 #include "regops_gk20a.h"
-#include "hw_gr_gk20a.h"
-#include "hw_fb_gk20a.h"
-#include "hw_timer_gk20a.h"
+
+#include <nvgpu/hw/gk20a/hw_gr_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_fb_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_timer_gk20a.h>
 
 
 #define HZ_TO_MHZ(a) ((a > 0xF414F9CD7) ? 0xffff : (a >> 32) ? \
diff --git a/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c
index a443512c..7633c873 100644
--- a/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c
@@ -28,8 +28,9 @@
 #include "ctxsw_trace_gk20a.h"
 #include "gk20a.h"
 #include "gr_gk20a.h"
-#include "hw_ctxsw_prog_gk20a.h"
-#include "hw_gr_gk20a.h"
+
+#include <nvgpu/hw/gk20a/hw_ctxsw_prog_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_gr_gk20a.h>
 
 #define GK20A_CTXSW_TRACE_MAX_VM_RING_SIZE      (128*PAGE_SIZE)
 
diff --git a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
index ac96036f..be9f7fc6 100644
--- a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
@@ -28,9 +28,10 @@
 #include "gr_gk20a.h"
 #include "dbg_gpu_gk20a.h"
 #include "regops_gk20a.h"
-#include "hw_therm_gk20a.h"
-#include "hw_gr_gk20a.h"
-#include "hw_perf_gk20a.h"
+
+#include <nvgpu/hw/gk20a/hw_therm_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_gr_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_perf_gk20a.h>
 
 /*
  * API to get first channel from the list of all channels
diff --git a/drivers/gpu/nvgpu/gk20a/debug_gk20a.c b/drivers/gpu/nvgpu/gk20a/debug_gk20a.c
index 8fa108c2..609ddf72 100644
--- a/drivers/gpu/nvgpu/gk20a/debug_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/debug_gk20a.c
@@ -27,10 +27,10 @@
 #include "debug_gk20a.h"
 #include "semaphore_gk20a.h"
 
-#include "hw_ram_gk20a.h"
-#include "hw_fifo_gk20a.h"
-#include "hw_ccsr_gk20a.h"
-#include "hw_pbdma_gk20a.h"
+#include <nvgpu/hw/gk20a/hw_ram_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_fifo_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h>
 
 unsigned int gk20a_debug_trace_cmdbuf;
 
diff --git a/drivers/gpu/nvgpu/gk20a/fb_gk20a.c b/drivers/gpu/nvgpu/gk20a/fb_gk20a.c
index 2fb7f64b..1efa56fb 100644
--- a/drivers/gpu/nvgpu/gk20a/fb_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fb_gk20a.c
@@ -17,10 +17,11 @@
 
 #include "gk20a.h"
 #include "kind_gk20a.h"
-#include "hw_mc_gk20a.h"
-#include "hw_fb_gk20a.h"
 #include "fb_gk20a.h"
 
+#include <nvgpu/hw/gk20a/hw_mc_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_fb_gk20a.h>
+
 void fb_gk20a_reset(struct gk20a *g)
 {
         u32 val;
diff --git a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
index a07faa93..ab88d5cb 100644
--- a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
@@ -28,8 +28,9 @@
 #include "fecs_trace_gk20a.h"
 #include "gk20a.h"
 #include "gr_gk20a.h"
-#include "hw_ctxsw_prog_gk20a.h"
-#include "hw_gr_gk20a.h"
+
+#include <nvgpu/hw/gk20a/hw_ctxsw_prog_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_gr_gk20a.h>
 
 /*
  * If HW circular buffer is getting too many "buffer full" conditions,
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index fb772ebd..ccc3afca 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -27,13 +27,15 @@
 #include "debug_gk20a.h"
 #include "ctxsw_trace_gk20a.h"
 #include "semaphore_gk20a.h"
-#include "hw_fifo_gk20a.h"
-#include "hw_pbdma_gk20a.h"
-#include "hw_ccsr_gk20a.h"
-#include "hw_ram_gk20a.h"
-#include "hw_top_gk20a.h"
-#include "hw_mc_gk20a.h"
-#include "hw_gr_gk20a.h"
+
+#include <nvgpu/hw/gk20a/hw_fifo_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_ram_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_top_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_mc_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_gr_gk20a.h>
+
 #define FECS_METHOD_WFI_RESTORE 0x80000
 
 static int gk20a_fifo_update_runlist_locked(struct gk20a *g, u32 runlist_id,
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 753f031a..f2094bfa 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -51,14 +51,6 @@
 #include "ctrl_gk20a.h"
 #include "channel_sync_gk20a.h"
 
-#include "hw_mc_gk20a.h"
-#include "hw_timer_gk20a.h"
-#include "hw_bus_gk20a.h"
-#include "hw_sim_gk20a.h"
-#include "hw_top_gk20a.h"
-#include "hw_ltc_gk20a.h"
-#include "hw_gr_gk20a.h"
-#include "hw_fb_gk20a.h"
 #include "gk20a_scale.h"
 #include "ctxsw_trace_gk20a.h"
 #include "dbg_gpu_gk20a.h"
@@ -81,6 +73,16 @@
 #include "nvgpu_gpuid_t19x.h"
 #endif
 
+#include <nvgpu/hw/gk20a/hw_mc_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_timer_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_bus_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_sim_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_top_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_ltc_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_gr_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_fb_gk20a.h>
+
+
 #ifdef CONFIG_ARM64
 #define __cpuc_flush_dcache_area __flush_dcache_area
 #endif
diff --git a/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c
index 360af2f4..e651ad2e 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c
@@ -23,9 +23,10 @@
 
 #include "gk20a.h"
 #include "gr_ctx_gk20a.h"
-#include "hw_gr_gk20a.h"
 #include "nvgpu_common.h"
 
+#include <nvgpu/hw/gk20a/hw_gr_gk20a.h>
+
 static int gr_gk20a_alloc_load_netlist_u32(u32 *src, u32 len,
                         struct u32_list_gk20a *u32_list)
 {
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 2ee2dd43..94f66e83 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -34,24 +34,6 @@
 #include "gk20a.h"
 #include "kind_gk20a.h"
 #include "gr_ctx_gk20a.h"
-#include "nvgpu_common.h"
-
-#include "hw_ccsr_gk20a.h"
-#include "hw_ctxsw_prog_gk20a.h"
-#include "hw_fifo_gk20a.h"
-#include "hw_gr_gk20a.h"
-#include "hw_gmmu_gk20a.h"
-#include "hw_mc_gk20a.h"
-#include "hw_ram_gk20a.h"
-#include "hw_pri_ringmaster_gk20a.h"
-#include "hw_pri_ringstation_sys_gk20a.h"
-#include "hw_pri_ringstation_gpc_gk20a.h"
-#include "hw_pri_ringstation_fbp_gk20a.h"
-#include "hw_top_gk20a.h"
-#include "hw_ltc_gk20a.h"
-#include "hw_fb_gk20a.h"
-#include "hw_therm_gk20a.h"
-#include "hw_pbdma_gk20a.h"
 #include "gr_pri_gk20a.h"
 #include "regops_gk20a.h"
 #include "dbg_gpu_gk20a.h"
@@ -59,6 +41,24 @@
 #include "semaphore_gk20a.h"
 #include "platform_gk20a.h"
 #include "ctxsw_trace_gk20a.h"
+#include "nvgpu_common.h"
+
+#include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_ctxsw_prog_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_fifo_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_gr_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_gmmu_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_mc_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_ram_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_pri_ringmaster_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_pri_ringstation_sys_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_pri_ringstation_gpc_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_pri_ringstation_fbp_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_top_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_ltc_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_fb_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_therm_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h>
 
 #define BLK_SIZE (256)
 #define NV_PMM_FBP_STRIDE       0x1000
diff --git a/drivers/gpu/nvgpu/gk20a/gr_pri_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_pri_gk20a.h
index c3ced432..b89124d6 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_pri_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_pri_gk20a.h
@@ -23,6 +23,8 @@
  * of the context state store for gr/compute contexts.
  */
 
+#include <nvgpu/hw/gk20a/hw_ltc_gk20a.h>
+
 /*
  * GPC pri addressing
  */
diff --git a/drivers/gpu/nvgpu/gk20a/hal_gk20a.c b/drivers/gpu/nvgpu/gk20a/hal_gk20a.c
index 6be62c5e..9eb8e835 100644
--- a/drivers/gpu/nvgpu/gk20a/hal_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/hal_gk20a.c
@@ -29,11 +29,12 @@
 #include "clk_gk20a.h"
 #include "regops_gk20a.h"
 #include "therm_gk20a.h"
-#include "hw_proj_gk20a.h"
 #include "tsg_gk20a.h"
 #include "dbg_gpu_gk20a.h"
 #include "css_gr_gk20a.h"
 
+#include <nvgpu/hw/gk20a/hw_proj_gk20a.h>
+
 static struct gpu_ops gk20a_ops = {
         .clock_gating = {
                 .slcg_gr_load_gating_prod =
diff --git a/drivers/gpu/nvgpu/gk20a/kind_gk20a.c b/drivers/gpu/nvgpu/gk20a/kind_gk20a.c
index b76fdfcf..00e7a54c 100644
--- a/drivers/gpu/nvgpu/gk20a/kind_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/kind_gk20a.c
@@ -21,9 +21,10 @@
 #include <linux/bitops.h>
 #include <linux/compiler.h>
 
-#include "hw_gmmu_gk20a.h"
 #include "kind_gk20a.h"
 
+#include <nvgpu/hw/gk20a/hw_gmmu_gk20a.h>
+
 /* TBD: generate these from kind_macros.h */
 
 /* TBD: not sure on the work creation for gk20a, doubtful */
diff --git a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c
index a81ed66c..103952ca 100644
--- a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c
@@ -19,9 +19,10 @@
 #include <linux/kernel.h>
 #include <trace/events/gk20a.h>
 
-#include "hw_ltc_gk20a.h"
 #include "gk20a.h"
 
+#include <nvgpu/hw/gk20a/hw_ltc_gk20a.h>
+
 #include "ltc_common.c"
 
 static int gk20a_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
diff --git a/drivers/gpu/nvgpu/gk20a/mc_gk20a.c b/drivers/gpu/nvgpu/gk20a/mc_gk20a.c
index 57368235..107c851c 100644
--- a/drivers/gpu/nvgpu/gk20a/mc_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mc_gk20a.c
@@ -18,7 +18,8 @@
 
 #include "gk20a.h"
 #include "mc_gk20a.h"
-#include "hw_mc_gk20a.h"
+
+#include <nvgpu/hw/gk20a/hw_mc_gk20a.h>
 
 irqreturn_t mc_gk20a_isr_stall(struct gk20a *g)
 {
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
index d594a5a4..74476fe4 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
@@ -38,18 +38,18 @@
 #include "gk20a.h"
 #include "mm_gk20a.h"
 #include "fence_gk20a.h"
-#include "hw_gmmu_gk20a.h"
-#include "hw_fb_gk20a.h"
-#include "hw_bus_gk20a.h"
-#include "hw_ram_gk20a.h"
-#include "hw_pram_gk20a.h"
-#include "hw_mc_gk20a.h"
-#include "hw_flush_gk20a.h"
-#include "hw_ltc_gk20a.h"
-
 #include "kind_gk20a.h"
 #include "semaphore_gk20a.h"
 
+#include <nvgpu/hw/gk20a/hw_gmmu_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_fb_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_bus_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_ram_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_pram_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_mc_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_flush_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_ltc_gk20a.h>
+
 /*
  * Flip this to force all gk20a_mem* accesses via PRAMIN from the start of the
  * boot, even for buffers that would work via cpu_va. In runtime, the flag is
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index 01b9dddf..1aa423a8 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -29,11 +29,12 @@
 #include "gk20a.h"
 #include "gr_gk20a.h"
 #include "semaphore_gk20a.h"
-#include "hw_mc_gk20a.h"
-#include "hw_pwr_gk20a.h"
-#include "hw_top_gk20a.h"
 #include "nvgpu_common.h"
 
+#include <nvgpu/hw/gk20a/hw_mc_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_pwr_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_top_gk20a.h>
+
 #ifdef CONFIG_ARCH_TEGRA_18x_SOC
 #include "nvgpu_gpuid_t18x.h"
 #endif
diff --git a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c
index 695d646f..d16c5fd1 100644
--- a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c
@@ -19,9 +19,10 @@
 #include <linux/delay.h>        /* for mdelay */
 
 #include "gk20a.h"
-#include "hw_mc_gk20a.h"
-#include "hw_pri_ringmaster_gk20a.h"
-#include "hw_pri_ringstation_sys_gk20a.h"
+
+#include <nvgpu/hw/gk20a/hw_mc_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_pri_ringmaster_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_pri_ringstation_sys_gk20a.h>
 
 void gk20a_reset_priv_ring(struct gk20a *g)
 {
@@ -97,4 +98,3 @@ void gk20a_priv_ring_isr(struct gk20a *g)
         gk20a_dbg_info("ringmaster intr status0: 0x%08x,"
                 " status1: 0x%08x", status0, status1);
 }
-
diff --git a/drivers/gpu/nvgpu/gk20a/sched_gk20a.c b/drivers/gpu/nvgpu/gk20a/sched_gk20a.c
index a60be7ef..c2374b96 100644
--- a/drivers/gpu/nvgpu/gk20a/sched_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/sched_gk20a.c
@@ -24,13 +24,15 @@
 #include <linux/debugfs.h>
 #include <linux/log2.h>
 #include <uapi/linux/nvgpu.h>
+
 #include "ctxsw_trace_gk20a.h"
 #include "gk20a.h"
 #include "gr_gk20a.h"
-#include "hw_ctxsw_prog_gk20a.h"
-#include "hw_gr_gk20a.h"
 #include "sched_gk20a.h"
 
+#include <nvgpu/hw/gk20a/hw_ctxsw_prog_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_gr_gk20a.h>
+
 ssize_t gk20a_sched_dev_read(struct file *filp, char __user *buf,
         size_t size, loff_t *off)
 {
diff --git a/drivers/gpu/nvgpu/gk20a/therm_gk20a.c b/drivers/gpu/nvgpu/gk20a/therm_gk20a.c
index e983a814..234c2937 100644
--- a/drivers/gpu/nvgpu/gk20a/therm_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/therm_gk20a.c
@@ -20,8 +20,9 @@
  */
 
 #include "gk20a.h"
-#include "hw_gr_gk20a.h"
-#include "hw_therm_gk20a.h"
+
+#include <nvgpu/hw/gk20a/hw_gr_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_therm_gk20a.h>
 
 static int gk20a_init_therm_reset_enable_hw(struct gk20a *g)
 {
diff --git a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c
index 8e6f763a..3b2cca0d 100644
--- a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c
@@ -23,7 +23,8 @@
 #include <linux/anon_inodes.h>
 
 #include "gk20a.h"
-#include "hw_ccsr_gk20a.h"
+
+#include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h>
 
 #define NVGPU_TSG_MIN_TIMESLICE_US 1000
 #define NVGPU_TSG_MAX_TIMESLICE_US 50000
diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
index 6cb238b7..367d5943 100644
--- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
@@ -22,9 +22,9 @@
 #include "hw_top_gm20b.h"
 #include "hw_pri_ringmaster_gm20b.h"
 
-#include "gk20a/ltc_common.c"
 #include "gk20a/gk20a.h"
 
+#include "gk20a/ltc_common.c"
 
 static int gm20b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
 {
diff --git a/drivers/gpu/nvgpu/gk20a/hw_bus_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_bus_gk20a.h
index 2c902f52..2c902f52 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_bus_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_bus_gk20a.h
diff --git a/drivers/gpu/nvgpu/gk20a/hw_ccsr_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_ccsr_gk20a.h
index 4877e4a8..4877e4a8 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_ccsr_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_ccsr_gk20a.h
diff --git a/drivers/gpu/nvgpu/gk20a/hw_ce2_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_ce2_gk20a.h
index df1fa836..df1fa836 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_ce2_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_ce2_gk20a.h
diff --git a/drivers/gpu/nvgpu/gk20a/hw_ctxsw_prog_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_ctxsw_prog_gk20a.h
index 81293403..81293403 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_ctxsw_prog_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_ctxsw_prog_gk20a.h
diff --git a/drivers/gpu/nvgpu/gk20a/hw_fb_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_fb_gk20a.h
index b9e124b7..b9e124b7 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_fb_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_fb_gk20a.h
diff --git a/drivers/gpu/nvgpu/gk20a/hw_fifo_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_fifo_gk20a.h
index 4d54c89f..4d54c89f 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_fifo_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_fifo_gk20a.h
diff --git a/drivers/gpu/nvgpu/gk20a/hw_flush_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_flush_gk20a.h
index 9cd91fad..9cd91fad 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_flush_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_flush_gk20a.h
diff --git a/drivers/gpu/nvgpu/gk20a/hw_gmmu_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_gmmu_gk20a.h
index 0a21b6ca..0a21b6ca 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_gmmu_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_gmmu_gk20a.h
diff --git a/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_gr_gk20a.h
index 1a888b53..1a888b53 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_gr_gk20a.h
diff --git a/drivers/gpu/nvgpu/gk20a/hw_ltc_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_ltc_gk20a.h
index 84b9c9a6..84b9c9a6 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_ltc_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_ltc_gk20a.h
diff --git a/drivers/gpu/nvgpu/gk20a/hw_mc_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_mc_gk20a.h
index ea3c2528..ea3c2528 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_mc_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_mc_gk20a.h
diff --git a/drivers/gpu/nvgpu/gk20a/hw_pbdma_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pbdma_gk20a.h
index 09cfc084..09cfc084 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_pbdma_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pbdma_gk20a.h
diff --git a/drivers/gpu/nvgpu/gk20a/hw_perf_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_perf_gk20a.h
index 1ca80d29..1ca80d29 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_perf_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_perf_gk20a.h
diff --git a/drivers/gpu/nvgpu/gk20a/hw_pram_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pram_gk20a.h
index 918dad9a..918dad9a 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_pram_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pram_gk20a.h
diff --git a/drivers/gpu/nvgpu/gk20a/hw_pri_ringmaster_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pri_ringmaster_gk20a.h
index d4007613..d4007613 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_pri_ringmaster_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pri_ringmaster_gk20a.h
diff --git a/drivers/gpu/nvgpu/gk20a/hw_pri_ringstation_fbp_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pri_ringstation_fbp_gk20a.h
index db16a8de..db16a8de 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_pri_ringstation_fbp_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pri_ringstation_fbp_gk20a.h
diff --git a/drivers/gpu/nvgpu/gk20a/hw_pri_ringstation_gpc_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pri_ringstation_gpc_gk20a.h
index e8aad933..e8aad933 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_pri_ringstation_gpc_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pri_ringstation_gpc_gk20a.h
diff --git a/drivers/gpu/nvgpu/gk20a/hw_pri_ringstation_sys_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pri_ringstation_sys_gk20a.h
index c281dd54..c281dd54 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_pri_ringstation_sys_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pri_ringstation_sys_gk20a.h
diff --git a/drivers/gpu/nvgpu/gk20a/hw_proj_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_proj_gk20a.h
index 047dc7d5..047dc7d5 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_proj_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_proj_gk20a.h
diff --git a/drivers/gpu/nvgpu/gk20a/hw_pwr_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pwr_gk20a.h
index ab1eb184..ab1eb184 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_pwr_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pwr_gk20a.h
diff --git a/drivers/gpu/nvgpu/gk20a/hw_ram_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_ram_gk20a.h
index 0009be33..0009be33 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_ram_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_ram_gk20a.h
diff --git a/drivers/gpu/nvgpu/gk20a/hw_sim_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_sim_gk20a.h
index b1e6658d..b1e6658d 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_sim_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_sim_gk20a.h
diff --git a/drivers/gpu/nvgpu/gk20a/hw_therm_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_therm_gk20a.h
index 3f3052ab..3f3052ab 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_therm_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_therm_gk20a.h
diff --git a/drivers/gpu/nvgpu/gk20a/hw_timer_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_timer_gk20a.h
index 4cb36cbe..4cb36cbe 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_timer_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_timer_gk20a.h
diff --git a/drivers/gpu/nvgpu/gk20a/hw_top_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_top_gk20a.h
index d99e6135..d99e6135 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_top_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_top_gk20a.h
diff --git a/drivers/gpu/nvgpu/gk20a/hw_trim_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_trim_gk20a.h
index 3b0aa05b..3b0aa05b 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_trim_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_trim_gk20a.h
diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
index e9a2d582..339f2237 100644
--- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
@@ -18,8 +18,9 @@
 
 #include "vgpu/vgpu.h"
 #include "gk20a/ctxsw_trace_gk20a.h"
-#include "gk20a/hw_fifo_gk20a.h"
-#include "gk20a/hw_ram_gk20a.h"
+
+#include <nvgpu/hw/gk20a/hw_fifo_gk20a.h>
+#include <nvgpu/hw/gk20a/hw_ram_gk20a.h>
 
 static void vgpu_channel_bind(struct channel_gk20a *ch)
 {
diff --git a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
index 02a5e87e..6cafc49f 100644
--- a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
@@ -14,9 +14,10 @@
  */
 
 #include "vgpu/vgpu.h"
-#include "gk20a/hw_gr_gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
 
+#include <nvgpu/hw/gk20a/hw_gr_gk20a.h>
+
 static void vgpu_gr_detect_sm_arch(struct gk20a *g)
 {
         struct vgpu_priv_data *priv = vgpu_get_priv_data(g);
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c
index c3dba7d1..0ac79345 100644
--- a/drivers/gpu/nvgpu/vgpu/vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/vgpu.c
@@ -23,13 +23,14 @@
 #include "vgpu/fecs_trace_vgpu.h"
 #include "gk20a/debug_gk20a.h"
 #include "gk20a/hal_gk20a.h"
-#include "gk20a/hw_mc_gk20a.h"
 #include "gk20a/ctxsw_trace_gk20a.h"
 #include "gk20a/tsg_gk20a.h"
 #include "gk20a/gk20a_scale.h"
 #include "gk20a/channel_gk20a.h"
 #include "gm20b/hal_gm20b.h"
 
+#include <nvgpu/hw/gk20a/hw_mc_gk20a.h>
+
 #ifdef CONFIG_ARCH_TEGRA_18x_SOC
 #include "nvgpu_gpuid_t18x.h"
 #endif