gpu: nvgpu: remove ctx header desc type

The graphics subctx header object is nothing but memory. Drop the
dependency to gr header file in the channel header file and substitute
struct nvgpu_mem for struct ctx_header_desc.

Jira NVGPU-967

Change-Id: Ic3976391016c42d2ada4aac3e0851a1222244ce9
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1807370
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

4 files changed, 6 insertions, 13 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
index f7515294..2a1fd03f 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
@@ -29,8 +29,8 @@
 #include <nvgpu/timers.h>
 #include <nvgpu/cond.h>
 #include <nvgpu/atomic.h>
+#include <nvgpu/nvgpu_mem.h>
 
-#include "gr_gk20a.h"
 
 struct gk20a;
 struct dbg_session_gk20a;
@@ -266,7 +266,7 @@ struct channel_gk20a {
         u64 virt_ctx;
 #endif
 
-        struct ctx_header_desc ctx_header;
+        struct nvgpu_mem ctx_header;
 
         /* Any operating system specific data. */
         void *os_priv;
diff --git a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
index b4a241e4..78b753d1 100644
--- a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
@@ -669,7 +669,7 @@ int gk20a_fecs_trace_bind_channel(struct gk20a *g,
                         GK20A_FECS_TRACE_NUM_RECORDS));
 
         if (nvgpu_is_enabled(g, NVGPU_FECS_TRACE_VA))
-                mem = &ch->ctx_header.mem;
+                mem = &ch->ctx_header;
 
         nvgpu_mem_wr(g, mem,
                 ctxsw_prog_main_image_context_timestamp_buffer_ptr_o(),
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index dbf9ff05..ead5d34a 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -808,8 +808,7 @@ static int gr_gk20a_ctx_zcull_setup(struct gk20a *g, struct channel_gk20a *c)
         struct tsg_gk20a *tsg;
         struct nvgpu_gr_ctx *gr_ctx = NULL;
         struct nvgpu_mem *mem = NULL;
-        struct ctx_header_desc *ctx = &c->ctx_header;
-        struct nvgpu_mem *ctxheader = &ctx->mem;
+        struct nvgpu_mem *ctxheader = &c->ctx_header;
         int ret = 0;
 
         nvgpu_log_fn(g, " ");
@@ -1683,8 +1682,7 @@ int gr_gk20a_update_hwpm_ctxsw_mode(struct gk20a *g,
         struct pm_ctx_desc *pm_ctx;
         u32 data;
         u64 virt_addr = 0;
-        struct ctx_header_desc *ctx = &c->ctx_header;
-        struct nvgpu_mem *ctxheader = &ctx->mem;
+        struct nvgpu_mem *ctxheader = &c->ctx_header;
         int ret;
 
         nvgpu_log_fn(g, " ");
@@ -6620,8 +6618,7 @@ static int gr_gk20a_ctx_patch_smpc(struct gk20a *g,
         u32 tpc_in_gpc_stride = nvgpu_get_litter_value(g, GPU_LIT_TPC_IN_GPC_STRIDE);
         struct tsg_gk20a *tsg;
         struct nvgpu_gr_ctx *gr_ctx;
-        struct ctx_header_desc *ctx = &ch->ctx_header;
-        struct nvgpu_mem *ctxheader = &ctx->mem;
+        struct nvgpu_mem *ctxheader = &ch->ctx_header;
 
         tsg = tsg_gk20a_from_ch(ch);
         if (!tsg)
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index bd5e625d..0d32cca3 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -434,10 +434,6 @@ struct gr_gk20a {
 
 void gk20a_fecs_dump_falcon_stats(struct gk20a *g);
 
-struct ctx_header_desc {
-        struct nvgpu_mem mem;
-};
-
 /* contexts associated with a TSG */
 struct nvgpu_gr_ctx {
         struct nvgpu_mem mem;