gpu: nvgpu: support gk20a virtualization

The nvgpu driver now supports using the Tegra graphics virtualization
interfaces to support gk20a in a virtualized environment.

Bug 1509608

Change-Id: I6ede15ee7bf0b0ad8a13e8eb5f557c3516ead676
Signed-off-by: Aingara Paramakuru <aparamakuru@nvidia.com>
Reviewed-on: http://git-master/r/440122
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>

1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c
index e5628c3f..7338f842 100644
--- a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c
@@ -158,6 +158,9 @@ long gk20a_ctrl_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg
         struct zbc_entry *zbc_val;
         struct zbc_query_params *zbc_tbl;
         int i, err = 0;
+#ifdef CONFIG_TEGRA_GR_VIRTUALIZATION
+        struct gk20a_platform *platform = platform_get_drvdata(dev);
+#endif
 
         gk20a_dbg_fn("");
 
@@ -197,7 +200,7 @@ long gk20a_ctrl_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg
                 if (zcull_info == NULL)
                         return -ENOMEM;
 
-                err = gr_gk20a_get_zcull_info(g, &g->gr, zcull_info);
+                err = g->ops.gr.get_zcull_info(g, &g->gr, zcull_info);
                 if (err) {
                         kfree(zcull_info);
                         break;
@@ -219,6 +222,11 @@ long gk20a_ctrl_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg
         case NVHOST_GPU_IOCTL_ZBC_SET_TABLE:
                 set_table_args = (struct nvhost_gpu_zbc_set_table_args *)buf;
 
+#ifdef CONFIG_TEGRA_GR_VIRTUALIZATION
+                if (platform->virtual_dev)
+                        return -ENOMEM;
+#endif
+
                 zbc_val = kzalloc(sizeof(struct zbc_entry), GFP_KERNEL);
                 if (zbc_val == NULL)
                         return -ENOMEM;