gpu: nvgpu: ctxheader changes for t19x

JIRA GPUT19X-49
Bug  200311674
Bug  1960226

Change-Id: I913e0dd16c51db3f92cb44abaf3f3afa1ce46c0e
Signed-off-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1522444
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>

1 files changed, 12 insertions, 1 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 838fe494..2aec662c 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -680,9 +680,20 @@ int gr_gk20a_ctx_patch_write_begin(struct gk20a *g,
 void gr_gk20a_ctx_patch_write_end(struct gk20a *g,
                                         struct channel_ctx_gk20a *ch_ctx)
 {
+        struct ctx_header_desc *ctx = &ch_ctx->ctx_header;
+        struct nvgpu_mem *ctxheader = &ctx->mem;
+
         nvgpu_mem_end(g, &ch_ctx->patch_ctx.mem);
+
         /* Write context count to context image if it is mapped */
-        if (ch_ctx->gr_ctx->mem.cpu_va) {
+        if (ctxheader->gpu_va) {
+
+                if (ctxheader->cpu_va)
+                        nvgpu_mem_wr(g, ctxheader,
+                             ctxsw_prog_main_image_patch_count_o(),
+                             ch_ctx->patch_ctx.data_count);
+
+        } else if (ch_ctx->gr_ctx->mem.cpu_va) {
                 nvgpu_mem_wr(g, &ch_ctx->gr_ctx->mem,
                              ctxsw_prog_main_image_patch_count_o(),
                              ch_ctx->patch_ctx.data_count);