nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-22 17:36:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: vgpu: remove ce_app support

Browse Source 
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>
This commit is contained in:
Richard Zhao
2020-05-22 17:31:28 -07:00
committed by Alex Waterman
parent 246b5fcf4d
commit cef1780e05
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gp10b.c
View File

@@ -30,7 +30,6 @@
#include <nvgpu/gr/gr_intr.h> #include <nvgpu/gr/gr_intr.h>
#include <nvgpu/acr.h> #include <nvgpu/acr.h>
#include <nvgpu/ce.h> #include <nvgpu/ce.h>
#include <nvgpu/ce_app.h>
#include <nvgpu/pmu.h> #include <nvgpu/pmu.h>
#include <nvgpu/runlist.h> #include <nvgpu/runlist.h>
#ifdef CONFIG_NVGPU_LS_PMU #ifdef CONFIG_NVGPU_LS_PMU
@@ -164,9 +163,9 @@ static const struct gpu_ops vgpu_gp10b_ops = {
.ce = { .ce = {
.ce_init_support = nvgpu_ce_init_support, .ce_init_support = nvgpu_ce_init_support,
#ifdef CONFIG_NVGPU_DGPU #ifdef CONFIG_NVGPU_DGPU
.ce_app_init_support = nvgpu_ce_app_init_support, .ce_app_init_support = NULL,
.ce_app_suspend = nvgpu_ce_app_suspend, .ce_app_suspend = NULL,
.ce_app_destroy = nvgpu_ce_app_destroy, .ce_app_destroy = NULL,
#endif #endif
.isr_stall = NULL, .isr_stall = NULL,
.isr_nonstall = NULL, .isr_nonstall = NULL,

7
drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gv11b.c
View File

@@ -98,7 +98,6 @@
#include <nvgpu/error_notifier.h> #include <nvgpu/error_notifier.h>
#include <nvgpu/acr.h> #include <nvgpu/acr.h>
#include <nvgpu/ce.h> #include <nvgpu/ce.h>
#include <nvgpu/ce_app.h>
#include <nvgpu/pmu.h> #include <nvgpu/pmu.h>
#include <nvgpu/runlist.h> #include <nvgpu/runlist.h>
#include <nvgpu/nvhost.h> #include <nvgpu/nvhost.h>
@@ -223,9 +222,9 @@ static const struct gpu_ops vgpu_gv11b_ops = {
.ce = { .ce = {
.ce_init_support = nvgpu_ce_init_support, .ce_init_support = nvgpu_ce_init_support,
#ifdef CONFIG_NVGPU_DGPU #ifdef CONFIG_NVGPU_DGPU
.ce_app_init_support = nvgpu_ce_app_init_support, .ce_app_init_support = NULL,
.ce_app_suspend = nvgpu_ce_app_suspend, .ce_app_suspend = NULL,
.ce_app_destroy = nvgpu_ce_app_destroy, .ce_app_destroy = NULL,
#endif #endif
.isr_stall = NULL, .isr_stall = NULL,
.isr_nonstall = NULL, .isr_nonstall = NULL,

3
drivers/gpu/nvgpu/os/linux/debug.c
View File

@@ -414,7 +414,8 @@ void gk20a_debug_init(struct gk20a *g, const char *debugfs_symlink)
#ifdef CONFIG_NVGPU_SUPPORT_CDE #ifdef CONFIG_NVGPU_SUPPORT_CDE
gk20a_cde_debugfs_init(g); gk20a_cde_debugfs_init(g);
#endif #endif
nvgpu_ce_debugfs_init(g); if (!g->is_virtual)
nvgpu_ce_debugfs_init(g);
nvgpu_alloc_debugfs_init(g); nvgpu_alloc_debugfs_init(g);
nvgpu_hal_debugfs_init(g); nvgpu_hal_debugfs_init(g);
gk20a_fifo_debugfs_init(g); gk20a_fifo_debugfs_init(g);