3 files changed, 19 insertions, 1 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 3f070a58..49038a0f 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -125,6 +125,7 @@ struct gpu_ops {
                                 u32 reg_offset);
                 int (*load_ctxsw_ucode)(struct gk20a *g);
                 u32 (*get_gpc_tpc_mask)(struct gk20a *g, u32 gpc_index);
+                void (*set_gpc_tpc_mask)(struct gk20a *g, u32 gpc_index);
                 void (*free_channel_ctx)(struct channel_gk20a *c);
                 int (*alloc_obj_ctx)(struct channel_gk20a  *c,
                                 struct nvgpu_alloc_obj_ctx_args *args);
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c b/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c
index 1f32ac6d..42720307 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c
@@ -607,9 +607,18 @@ static ssize_t tpc_fs_mask_store(struct device *device,
         if (kstrtoul(buf, 10, &val) < 0)
                 return -EINVAL;
 
-        if (val)
+        if (val && val != g->gr.gpc_tpc_mask[0] && g->ops.gr.set_gpc_tpc_mask) {
                 g->gr.gpc_tpc_mask[0] = val;
 
+                g->ops.gr.set_gpc_tpc_mask(g, 0);
+
+                kfree(g->gr.ctx_vars.local_golden_image);
+                g->gr.ctx_vars.local_golden_image = NULL;
+                g->gr.ctx_vars.golden_image_initialized = false;
+                g->gr.ctx_vars.golden_image_size = 0;
+                g->gr.sw_ready = false;
+        }
+
         return count;
 }
 
@@ -621,6 +630,11 @@ static ssize_t tpc_fs_mask_read(struct device *device,
         struct gr_gk20a *gr = &g->gr;
         u32 gpc_index;
         u32 tpc_fs_mask = 0;
+        int err = 0;
+
+        err = gk20a_busy(g->dev);
+        if (err)
+                return err;
 
         for (gpc_index = 0; gpc_index < gr->gpc_count; gpc_index++) {
                 if (g->ops.gr.get_gpc_tpc_mask)
@@ -629,6 +643,8 @@ static ssize_t tpc_fs_mask_read(struct device *device,
                                 (gr->max_tpc_per_gpc_count * gpc_index);
         }
 
+        gk20a_idle(g->dev);
+
         return sprintf(buf, "0x%x\n", tpc_fs_mask);
 }
 
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index da257cd4..3cf5845c 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -3084,6 +3084,7 @@ static int gr_gk20a_init_gr_config(struct gk20a *g, struct gr_gk20a *gr)
                 goto clean_up;
 
         gr->ppc_count = 0;
+        gr->tpc_count = 0;
         for (gpc_index = 0; gpc_index < gr->gpc_count; gpc_index++) {
                 tmp = gk20a_readl(g, gr_gpc0_fs_gpc_r());