3 files changed, 36 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c
index 2fdf719a..493cbe80 100644
--- a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c
@@ -246,6 +246,30 @@ static int gk20a_ctrl_get_tpc_masks(struct gk20a *g,
         return err;
 }
 
+static int gk20a_ctrl_get_fbp_l2_masks(
+        struct gk20a *g, struct nvgpu_gpu_get_fbp_l2_masks_args *args)
+{
+        struct gr_gk20a *gr = &g->gr;
+        int err = 0;
+        const u32 fbp_l2_mask_size = sizeof(u32) * gr->max_fbps_count;
+
+        if (args->mask_buf_size > 0) {
+                size_t write_size = fbp_l2_mask_size;
+
+                if (write_size > args->mask_buf_size)
+                        write_size = args->mask_buf_size;
+
+                err = copy_to_user((void __user *)(uintptr_t)
+                                   args->mask_buf_addr,
+                                   gr->fbp_rop_l2_en_mask, write_size);
+        }
+
+        if (err == 0)
+                args->mask_buf_size = fbp_l2_mask_size;
+
+        return err;
+}
+
 static int nvgpu_gpu_ioctl_l2_fb_ops(struct gk20a *g,
                 struct nvgpu_gpu_l2_fb_args *args)
 {
@@ -936,6 +960,10 @@ long gk20a_ctrl_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg
                 err = gk20a_ctrl_get_tpc_masks(g,
                         (struct nvgpu_gpu_get_tpc_masks_args *)buf);
                 break;
+        case NVGPU_GPU_IOCTL_GET_FBP_L2_MASKS:
+                err = gk20a_ctrl_get_fbp_l2_masks(g,
+                        (struct nvgpu_gpu_get_fbp_l2_masks_args *)buf);
+                break;
         case NVGPU_GPU_IOCTL_OPEN_CHANNEL:
                 /* this arg type here, but ..gpu_open_channel_args in nvgpu.h
                  * for consistency - they are the same */
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 41ef5424..4dbdb777 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -3257,6 +3257,7 @@ static void gk20a_remove_gr_support(struct gr_gk20a *gr)
         kfree(gr->sm_to_cluster);
         kfree(gr->gpc_skip_mask);
         kfree(gr->map_tiles);
+        kfree(gr->fbp_rop_l2_en_mask);
         gr->gpc_tpc_count = NULL;
         gr->gpc_zcb_count = NULL;
         gr->gpc_ppc_count = NULL;
@@ -3266,6 +3267,7 @@ static void gk20a_remove_gr_support(struct gr_gk20a *gr)
         gr->pes_tpc_mask[1] = NULL;
         gr->gpc_skip_mask = NULL;
         gr->map_tiles = NULL;
+        gr->fbp_rop_l2_en_mask = NULL;
 
         gr->ctx_vars.valid = false;
         kfree(gr->ctx_vars.ucode.fecs.inst.l);
@@ -3336,6 +3338,11 @@ static int gr_gk20a_init_gr_config(struct gk20a *g, struct gr_gk20a *gr)
 
         gr->fbp_en_mask = g->ops.gr.get_fbp_en_mask(g);
 
+        gr->fbp_rop_l2_en_mask =
+                kzalloc(gr->max_fbps_count * sizeof(u32), GFP_KERNEL);
+        if (!gr->fbp_rop_l2_en_mask)
+                goto clean_up;
+
         tmp = gk20a_readl(g, top_tpc_per_gpc_r());
         gr->max_tpc_per_gpc_count = top_tpc_per_gpc_value_v(tmp);
 
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index 1b7bc252..d03f945c 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -351,6 +351,7 @@ struct gr_gk20a {
         struct gr_t18x t18x;
 #endif
         u32 fbp_en_mask;
+        u32 *fbp_rop_l2_en_mask;
         u32 no_of_sm;
         struct sm_info *sm_to_cluster;
         struct nvgpu_dbg_gpu_sm_error_state_record *sm_error_states;