From cef1780e05befdf41c872f19de743b533cb6c235 Mon Sep 17 00:00:00 2001
From: Richard Zhao <rizhao@nvidia.com>
Date: Fri, 22 May 2020 17:31:28 -0700
Subject: [PATCH] gpu: nvgpu: vgpu: remove ce_app support

Kernel oops on dump ce_app debugfs nodes. ce_app is only used by dGPU
which vgpu does not support currently. This patch removes hal setup and
debugfs setup for ce_app.

Bug 2848790

Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Change-Id: Ia60a06a27b2d2ceda96ca567cda9e9a01e023c4b
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2349294
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gp10b.c | 7 +++----
 drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gv11b.c | 7 +++----
 drivers/gpu/nvgpu/os/linux/debug.c               | 3 ++-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gp10b.c
index 189bfe774..5539d58fc 100644
--- a/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gp10b.c
+++ b/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gp10b.c
@@ -30,7 +30,6 @@
 #include <nvgpu/gr/gr_intr.h>
 #include <nvgpu/acr.h>
 #include <nvgpu/ce.h>
-#include <nvgpu/ce_app.h>
 #include <nvgpu/pmu.h>
 #include <nvgpu/runlist.h>
 #ifdef CONFIG_NVGPU_LS_PMU
@@ -164,9 +163,9 @@ static const struct gpu_ops vgpu_gp10b_ops = {
 	.ce = {
 		.ce_init_support = nvgpu_ce_init_support,
 #ifdef CONFIG_NVGPU_DGPU
-		.ce_app_init_support = nvgpu_ce_app_init_support,
-		.ce_app_suspend = nvgpu_ce_app_suspend,
-		.ce_app_destroy = nvgpu_ce_app_destroy,
+		.ce_app_init_support = NULL,
+		.ce_app_suspend = NULL,
+		.ce_app_destroy = NULL,
 #endif
 		.isr_stall = NULL,
 		.isr_nonstall = NULL,
diff --git a/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gv11b.c
index 149c33dd0..7ee7bdf6c 100644
--- a/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gv11b.c
+++ b/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gv11b.c
@@ -98,7 +98,6 @@
 #include <nvgpu/error_notifier.h>
 #include <nvgpu/acr.h>
 #include <nvgpu/ce.h>
-#include <nvgpu/ce_app.h>
 #include <nvgpu/pmu.h>
 #include <nvgpu/runlist.h>
 #include <nvgpu/nvhost.h>
@@ -223,9 +222,9 @@ static const struct gpu_ops vgpu_gv11b_ops = {
 	.ce = {
 		.ce_init_support = nvgpu_ce_init_support,
 #ifdef CONFIG_NVGPU_DGPU
-		.ce_app_init_support = nvgpu_ce_app_init_support,
-		.ce_app_suspend = nvgpu_ce_app_suspend,
-		.ce_app_destroy = nvgpu_ce_app_destroy,
+		.ce_app_init_support = NULL,
+		.ce_app_suspend = NULL,
+		.ce_app_destroy = NULL,
 #endif
 		.isr_stall = NULL,
 		.isr_nonstall = NULL,
diff --git a/drivers/gpu/nvgpu/os/linux/debug.c b/drivers/gpu/nvgpu/os/linux/debug.c
index bf4eb0011..559e534ec 100644
--- a/drivers/gpu/nvgpu/os/linux/debug.c
+++ b/drivers/gpu/nvgpu/os/linux/debug.c
@@ -414,7 +414,8 @@ void gk20a_debug_init(struct gk20a *g, const char *debugfs_symlink)
 #ifdef CONFIG_NVGPU_SUPPORT_CDE
 	gk20a_cde_debugfs_init(g);
 #endif
-	nvgpu_ce_debugfs_init(g);
+	if (!g->is_virtual)
+		nvgpu_ce_debugfs_init(g);
 	nvgpu_alloc_debugfs_init(g);
 	nvgpu_hal_debugfs_init(g);
 	gk20a_fifo_debugfs_init(g);