gpu: nvgpu: Remove circular dependency in PMU includes

Remove including gk20a.h from pmu_gk20a.h. This causes a fallout
as some #includes were missing.

gr_gp10b.h uses mem_desc, but did not include mm_gk20a.h. Add the
include.

Including mm_gk20a.h in gr_gp10b.h causes recursive include, as
mm_gk20a.h has some gr defines. Move the defines to gr_gk20a.h to
remove the dependency.

gr_ctx_gk20a.h used struct gk20a pointers, but did not forward
declare it. Add a forward declaration.

gr_gk20a.h uses dbg_session_gk20a, but was missing forward
declaration.

gr_gk20a.h did not include nvgpu.h but it uses preemption types from
that header. Add include.

Change-Id: I2168e2303b55e0d187b816bcb26f37c8af1649ba
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1283717
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>

1 files changed, 1 insertions, 27 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
index 2b741451..5ef8ae25 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
@@ -1,7 +1,7 @@
 /*
  * GK20A memory management
  *
- * Copyright (c) 2011-2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2011-2017, 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,
@@ -112,32 +112,6 @@ struct pm_ctx_desc {
 };
 
 struct gk20a;
-struct gr_ctx_buffer_desc {
-        void (*destroy)(struct gk20a *, struct gr_ctx_buffer_desc *);
-        struct mem_desc mem;
-        void *priv;
-};
-
-#ifdef CONFIG_ARCH_TEGRA_18x_SOC
-#include "gr_t18x.h"
-#endif
-
-struct gr_ctx_desc {
-        struct mem_desc mem;
-
-        u32 graphics_preempt_mode;
-        u32 compute_preempt_mode;
-#ifdef CONFIG_ARCH_TEGRA_18x_SOC
-        struct gr_ctx_desc_t18x t18x;
-#endif
-#ifdef CONFIG_TEGRA_GR_VIRTUALIZATION
-        u64 virt_ctx;
-#endif
-};
-
-struct ctx_header_desc {
-        struct mem_desc mem;
-};
 
 struct compbit_store_desc {
         struct mem_desc mem;