gpu: nvgpu: move header location of gk20a.h

1) Update header path of gk20a.h files present in os/
to <nvgpu/gk20a.h>

2) os_fence_android_sema.c indirectly was dependent on gk20a.h via
semaphore.h. So, added #include <nvgpu/gk20a.h> in
os_fence_android_sema.c and replaced the header with forward
declaration of struct gk20a in semaphore.h

Jira NVGPU-597

Change-Id: I96e23befeb80713f3a399071eb5498f6f580211d
Signed-off-by: Debarshi Dutta <ddutta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1842868
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

drivers/gpu/nvgpu/include/nvgpu/semaphore.h

@@ -29,9 +29,10 @@
 #include <nvgpu/list.h>
 #include <nvgpu/nvgpu_mem.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
 
+struct gk20a;
+
 #define gpu_sema_dbg(g, fmt, args...)		\
 	nvgpu_log(g, gpu_dbg_sema, fmt, ##args)
 #define gpu_sema_verbose_dbg(g, fmt, args...)	\

drivers/gpu/nvgpu/os/linux/cde.c

@@ -34,10 +34,10 @@
 #include <nvgpu/os_sched.h>
 #include <nvgpu/channel.h>
 #include <nvgpu/utils.h>
+#include <nvgpu/gk20a.h>
 
 #include <nvgpu/linux/vm.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
 #include "gk20a/fence_gk20a.h"
 #include "gk20a/gr_gk20a.h"

drivers/gpu/nvgpu/os/linux/cde_gm20b.c

@@ -22,7 +22,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
+
 #include "cde_gm20b.h"
 
 enum programs {

drivers/gpu/nvgpu/os/linux/cde_gp10b.c

@@ -22,11 +22,11 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "gk20a/gk20a.h"
-#include "cde_gp10b.h"
-
 #include <nvgpu/log.h>
 #include <nvgpu/dma.h>
+#include <nvgpu/gk20a.h>
+
+#include "cde_gp10b.h"
 
 enum gp10b_programs {
 	GP10B_PROG_HPASS              = 0,

drivers/gpu/nvgpu/os/linux/clk.c

@@ -25,7 +25,7 @@
 #include "os_linux.h"
 #include "platform_gk20a.h"
 
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 #define HZ_TO_MHZ(x) ((x) / 1000000)
 

drivers/gpu/nvgpu/os/linux/comptags.c

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+* Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -17,10 +17,10 @@
 #include <linux/dma-buf.h>
 
 #include <nvgpu/comptags.h>
+#include <nvgpu/gk20a.h>
 
 #include <nvgpu/linux/vm.h>
 
-#include "gk20a/gk20a.h"
 #include "dmabuf.h"
 
 void gk20a_get_comptags(struct nvgpu_os_buffer *buf,

drivers/gpu/nvgpu/os/linux/ctxsw_trace.c

@@ -21,16 +21,15 @@
 #include <trace/events/gk20a.h>
 #include <uapi/linux/nvgpu.h>
 #include <nvgpu/ctxsw_trace.h>
-#include <nvgpu/channel.h>
-
-#include "gk20a/gk20a.h"
-#include "gk20a/gr_gk20a.h"
-#include "gk20a/fecs_trace_gk20a.h"
-
 #include <nvgpu/kmem.h>
 #include <nvgpu/log.h>
 #include <nvgpu/atomic.h>
 #include <nvgpu/barrier.h>
+#include <nvgpu/gk20a.h>
+#include <nvgpu/channel.h>
+
+#include "gk20a/gr_gk20a.h"
+#include "gk20a/fecs_trace_gk20a.h"
 
 #include "platform_gk20a.h"
 #include "os_linux.h"

drivers/gpu/nvgpu/os/linux/debug.c

@@ -27,7 +27,7 @@
 #include "os_linux.h"
 #include "platform_gk20a.h"
 
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>

drivers/gpu/nvgpu/os/linux/debug_ltc.c

@@ -14,7 +14,8 @@
 
 #include "debug_ltc.h"
 #include "os_linux.h"
-#include "gk20a/gk20a.h"
+
+#include <nvgpu/gk20a.h>
 
 #include <linux/debugfs.h>
 #include <linux/uaccess.h>

drivers/gpu/nvgpu/os/linux/dmabuf.c

@@ -20,10 +20,10 @@
 
 #include <nvgpu/comptags.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/gk20a.h>
 
 #include <nvgpu/linux/vm.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/fence_gk20a.h"
 
 #include "platform_gk20a.h"

drivers/gpu/nvgpu/os/linux/dmabuf_vidmem.c

@@ -27,11 +27,11 @@
 #include <nvgpu/vidmem.h>
 #include <nvgpu/nvgpu_mem.h>
 #include <nvgpu/page_allocator.h>
+#include <nvgpu/gk20a.h>
 
 #include <nvgpu/linux/vm.h>
 #include <nvgpu/linux/dma.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
 #include "dmabuf_vidmem.h"
 

drivers/gpu/nvgpu/os/linux/driver_common.c

@@ -28,8 +28,8 @@
 #include <nvgpu/enabled.h>
 #include <nvgpu/debug.h>
 #include <nvgpu/sizes.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "platform_gk20a.h"
 #include "module.h"
 #include "os_linux.h"

drivers/gpu/nvgpu/os/linux/ecc_sysfs.c

@@ -15,8 +15,8 @@
  */
 
 #include <nvgpu/ecc.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "os_linux.h"
 
 int nvgpu_ecc_sysfs_init(struct gk20a *g)

drivers/gpu/nvgpu/os/linux/firmware.c

@@ -19,8 +19,8 @@
 #include <nvgpu/kmem.h>
 #include <nvgpu/bug.h>
 #include <nvgpu/firmware.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "platform_gk20a.h"
 #include "os_linux.h"
 

drivers/gpu/nvgpu/os/linux/intr.c

@@ -14,7 +14,7 @@
 #include <trace/events/gk20a.h>
 #include <linux/irqreturn.h>
 
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 #include <nvgpu/atomic.h>
 #include <nvgpu/unit.h>

drivers/gpu/nvgpu/os/linux/io.c

@@ -13,9 +13,9 @@
 
 #include <nvgpu/io.h>
 #include <nvgpu/types.h>
+#include <nvgpu/gk20a.h>
 
 #include "os_linux.h"
-#include "gk20a/gk20a.h"
 
 void nvgpu_writel(struct gk20a *g, u32 r, u32 v)
 {

drivers/gpu/nvgpu/os/linux/io_usermode.c

@@ -13,9 +13,9 @@
 
 #include <nvgpu/io.h>
 #include <nvgpu/types.h>
+#include <nvgpu/gk20a.h>
 
 #include "os_linux.h"
-#include "gk20a/gk20a.h"
 
 #include <nvgpu/hw/gv11b/hw_usermode_gv11b.h>
 

drivers/gpu/nvgpu/os/linux/ioctl.c

@@ -20,8 +20,8 @@
 
 #include <nvgpu/nvgpu_common.h>
 #include <nvgpu/ctxsw_trace.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
 
 #include "ioctl_channel.h"

drivers/gpu/nvgpu/os/linux/ioctl_as.c

@@ -24,11 +24,11 @@
 #include <nvgpu/gmmu.h>
 #include <nvgpu/vm_area.h>
 #include <nvgpu/log2.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/channel.h>
 
 #include <nvgpu/linux/vm.h>
 
-#include "gk20a/gk20a.h"
 #include "platform_gk20a.h"
 #include "ioctl_as.h"
 #include "os_linux.h"

drivers/gpu/nvgpu/os/linux/ioctl_channel.c

@@ -34,10 +34,10 @@
 #include <nvgpu/barrier.h>
 #include <nvgpu/nvhost.h>
 #include <nvgpu/os_sched.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/channel.h>
 #include <nvgpu/channel_sync.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
 #include "gk20a/fence_gk20a.h"
 

drivers/gpu/nvgpu/os/linux/ioctl_clk_arb.c

@@ -35,8 +35,8 @@
 #include <nvgpu/cond.h>
 #include <nvgpu/list.h>
 #include <nvgpu/clk_arb.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "clk/clk.h"
 #include "pstate/pstate.h"
 #include "lpwr/lpwr.h"

drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c

@@ -31,6 +31,7 @@
 #include <nvgpu/sizes.h>
 #include <nvgpu/list.h>
 #include <nvgpu/clk_arb.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/channel.h>
 
 #include "ioctl_ctrl.h"
@@ -38,7 +39,6 @@
 #include "ioctl_as.h"
 #include "ioctl_tsg.h"
 #include "ioctl_channel.h"
-#include "gk20a/gk20a.h"
 #include "gk20a/fence_gk20a.h"
 
 #include "platform_gk20a.h"

drivers/gpu/nvgpu/os/linux/ioctl_dbg.c

@@ -30,12 +30,12 @@
 #include <nvgpu/atomic.h>
 #include <nvgpu/cond.h>
 #include <nvgpu/utils.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/channel.h>
 #include <nvgpu/tsg.h>
 
 #include <nvgpu/linux/vm.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/gr_gk20a.h"
 #include "gk20a/regops_gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"

drivers/gpu/nvgpu/os/linux/ioctl_tsg.c

@@ -25,10 +25,10 @@
 #include <nvgpu/kmem.h>
 #include <nvgpu/log.h>
 #include <nvgpu/os_sched.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/channel.h>
 #include <nvgpu/tsg.h>
 
-#include "gk20a/gk20a.h"
 #include "gv11b/fifo_gv11b.h"
 #include "platform_gk20a.h"
 #include "ioctl_tsg.h"

drivers/gpu/nvgpu/os/linux/kmem.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -25,8 +25,7 @@
 #include <nvgpu/kmem.h>
 #include <nvgpu/atomic.h>
 #include <nvgpu/bug.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 #include "kmem_priv.h"
 

drivers/gpu/nvgpu/os/linux/linux-channel.c

@@ -18,6 +18,7 @@
 #include <nvgpu/debug.h>
 #include <nvgpu/error_notifier.h>
 #include <nvgpu/os_sched.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/channel.h>
 
 /*
@@ -27,8 +28,6 @@
  */
 #include <nvgpu/linux/vm.h>
 
-#include "gk20a/gk20a.h"
-
 #include "channel.h"
 #include "ioctl_channel.h"
 #include "os_linux.h"

drivers/gpu/nvgpu/os/linux/linux-dma.c

@@ -25,11 +25,10 @@
 #include <nvgpu/kmem.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/vidmem.h>
+#include <nvgpu/gk20a.h>
 
 #include <nvgpu/linux/dma.h>
 
-#include "gk20a/gk20a.h"
-
 #include "platform_gk20a.h"
 #include "os_linux.h"
 #include "dmabuf_vidmem.h"

drivers/gpu/nvgpu/os/linux/log.c

@@ -18,8 +18,8 @@
 #include <linux/device.h>
 
 #include <nvgpu/log.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "platform_gk20a.h"
 #include "os_linux.h"
 

drivers/gpu/nvgpu/os/linux/ltc.c

@@ -23,8 +23,8 @@
 #include <nvgpu/ltc.h>
 #include <nvgpu/dma.h>
 #include <nvgpu/nvgpu_mem.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/gr_gk20a.h"
 
 int nvgpu_ltc_alloc_cbc(struct gk20a *g, size_t compbit_backing_size,

drivers/gpu/nvgpu/os/linux/nvgpu_mem.c

@@ -23,6 +23,7 @@
 #include <nvgpu/enabled.h>
 #include <nvgpu/kmem.h>
 #include <nvgpu/vidmem.h>
+#include <nvgpu/gk20a.h>
 
 #include <nvgpu/linux/dma.h>
 
@@ -32,7 +33,6 @@
 #include "os_linux.h"
 #include "dmabuf_vidmem.h"
 
-#include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
 #include "platform_gk20a.h"
 

drivers/gpu/nvgpu/os/linux/nvhost.c

@@ -19,11 +19,11 @@
 #include <linux/nvhost_ioctl.h>
 #include <linux/of_platform.h>
 
+#include <nvgpu/gk20a.h>
 #include <nvgpu/nvhost.h>
 
 #include "nvhost_priv.h"
 
-#include "gk20a/gk20a.h"
 #include "os_linux.h"
 #include "module.h"
 

drivers/gpu/nvgpu/os/linux/nvlink.c

@@ -18,7 +18,7 @@
 #include <linux/platform/tegra/tegra-nvlink.h>
 #endif
 
-#include <gk20a/gk20a.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/nvlink.h>
 #include <nvgpu/enabled.h>
 #include "module.h"

drivers/gpu/nvgpu/os/linux/os_fence_android.c

@@ -16,10 +16,9 @@
 #include <nvgpu/types.h>
 #include <nvgpu/os_fence.h>
 #include <nvgpu/linux/os_fence_android.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/channel.h>
 
-#include "gk20a/gk20a.h"
-
 #include "../drivers/staging/android/sync.h"
 
 inline struct sync_fence *nvgpu_get_sync_fence(struct nvgpu_os_fence *s)

drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c

@@ -20,6 +20,7 @@
 #include <nvgpu/os_fence.h>
 #include <nvgpu/linux/os_fence_android.h>
 #include <nvgpu/semaphore.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/channel.h>
 #include <nvgpu/channel_sync.h>
 

drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c

@@ -22,10 +22,10 @@
 #include <nvgpu/linux/os_fence_android.h>
 #include <nvgpu/nvhost.h>
 #include <nvgpu/atomic.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/channel.h>
 #include <nvgpu/channel_sync.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
 
 #include "../drivers/staging/android/sync.h"

drivers/gpu/nvgpu/os/linux/os_linux.h

@@ -21,7 +21,8 @@
 #include <linux/iommu.h>
 #include <linux/hashtable.h>
 
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
+
 #include "cde.h"
 #include "sched.h"
 

drivers/gpu/nvgpu/os/linux/pci.c

@@ -27,9 +27,9 @@
 #include <nvgpu/nvlink.h>
 #include <nvgpu/soc.h>
 #include <nvgpu/sim.h>
+#include <nvgpu/gk20a.h>
 
 #include "nvlink.h"
-#include "gk20a/gk20a.h"
 #include "clk/clk.h"
 #include "clk/clk_mclk.h"
 #include "module.h"

drivers/gpu/nvgpu/os/linux/platform_gk20a.h

@@ -19,8 +19,7 @@
 #include <linux/device.h>
 
 #include <nvgpu/lock.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 #define GK20A_CLKS_MAX		4
 

drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c

@@ -42,11 +42,11 @@
 #include <nvgpu/kmem.h>
 #include <nvgpu/bug.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/nvhost.h>
 
 #include <nvgpu/linux/dma.h>
 
-#include "gk20a/gk20a.h"
 #include "gm20b/clk_gm20b.h"
 
 #include "scale.h"

drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c

@@ -32,14 +32,13 @@
 #include <nvgpu/bug.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/hashtable.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/nvhost.h>
 
 #include "os_linux.h"
 
 #include "clk.h"
 
-#include "gk20a/gk20a.h"
-
 #include "platform_gk20a.h"
 #include "platform_gk20a_tegra.h"
 #include "platform_gp10b.h"

drivers/gpu/nvgpu/os/linux/platform_gv11b_tegra.c

@@ -25,6 +25,7 @@
 #include <linux/clk.h>
 #include <linux/platform/tegra/emc_bwmgr.h>
 
+#include <nvgpu/gk20a.h>
 #include <nvgpu/nvhost.h>
 
 #include <uapi/linux/nvgpu.h>
@@ -32,7 +33,6 @@
 #include <soc/tegra/tegra_bpmp.h>
 #include <soc/tegra/tegra_powergate.h>
 
-#include "gk20a/gk20a.h"
 #include "platform_gk20a.h"
 #include "clk.h"
 #include "scale.h"

drivers/gpu/nvgpu/os/linux/scale.c

@@ -25,9 +25,9 @@
 
 #include <nvgpu/kmem.h>
 #include <nvgpu/log.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/clk_arb.h>
 
-#include "gk20a/gk20a.h"
 #include "platform_gk20a.h"
 #include "scale.h"
 #include "os_linux.h"

drivers/gpu/nvgpu/os/linux/sched.c

@@ -23,8 +23,8 @@
 #include <nvgpu/log.h>
 #include <nvgpu/bug.h>
 #include <nvgpu/barrier.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/gr_gk20a.h"
 #include "sched.h"
 #include "os_linux.h"

drivers/gpu/nvgpu/os/linux/sim.c

@@ -26,7 +26,8 @@
 #include <nvgpu/soc.h>
 #include <nvgpu/hw_sim.h>
 #include <nvgpu/sim.h>
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
+
 #include "platform_gk20a.h"
 #include "os_linux.h"
 #include "module.h"

drivers/gpu/nvgpu/os/linux/sim_pci.c

@@ -26,7 +26,8 @@
 #include <nvgpu/hw_sim_pci.h>
 #include <nvgpu/sim.h>
 #include <nvgpu/io.h>
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
+
 #include "os_linux.h"
 #include "module.h"
 

drivers/gpu/nvgpu/os/linux/timers.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -19,8 +19,7 @@
 
 #include <nvgpu/timers.h>
 #include <nvgpu/soc.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 #include "platform_gk20a.h"
 

drivers/gpu/nvgpu/os/linux/vgpu/fecs_trace_vgpu.c

@@ -23,8 +23,8 @@
 #include <nvgpu/vgpu/vgpu_ivm.h>
 #include <nvgpu/vgpu/tegra_vgpu.h>
 #include <nvgpu/vgpu/vgpu.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "os/linux/os_linux.h"
 #include "gk20a/fecs_trace_gk20a.h"
 #include "vgpu/fecs_trace_vgpu.h"

drivers/gpu/nvgpu/os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c

@@ -17,8 +17,8 @@
 #include <linux/platform_device.h>
 
 #include <nvgpu/nvhost.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "vgpu/clk_vgpu.h"
 #include "os/linux/platform_gk20a.h"
 #include "os/linux/os_linux.h"

drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c

@@ -17,8 +17,8 @@
  */
 
 #include <nvgpu/nvhost.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "os/linux/platform_gk20a.h"
 #include "vgpu/clk_vgpu.h"
 #include "vgpu_linux.h"

drivers/gpu/nvgpu/os/linux/vm.c

@@ -26,11 +26,11 @@
 #include <nvgpu/page_allocator.h>
 #include <nvgpu/vidmem.h>
 #include <nvgpu/utils.h>
+#include <nvgpu/gk20a.h>
 
 #include <nvgpu/linux/vm.h>
 #include <nvgpu/linux/nvgpu_mem.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
 
 #include "platform_gk20a.h"

drivers/gpu/nvgpu/os/posix/log.c

@@ -23,7 +23,7 @@
 #include <nvgpu/log.h>
 #include <nvgpu/types.h>
 
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 /*
  * Define a length for log buffers. This is the buffer that the 'fmt, ...' part

drivers/gpu/nvgpu/os/posix/nvgpu.c

@@ -29,13 +29,12 @@
 #include <nvgpu/atomic.h>
 #include <nvgpu/nvgpu_common.h>
 #include <nvgpu/os_sched.h>
+#include <nvgpu/gk20a.h>
 
 #include <nvgpu/posix/probe.h>
 
 #include "os_posix.h"
 
-#include "gk20a/gk20a.h"
-
 void nvgpu_wait_for_deferred_interrupts(struct gk20a *g)
 {
 	/*

drivers/gpu/nvgpu/os/posix/os_posix.h

@@ -23,7 +23,7 @@
 #ifndef __NVGPU_OS_POSIX_H__
 #define __NVGPU_OS_POSIX_H__
 
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 struct nvgpu_posix_io_callbacks;