diff options
author | Deepak Nibade <dnibade@nvidia.com> | 2017-05-24 08:07:04 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-06-02 09:53:35 -0400 |
commit | 6090a8a7ee347f92d806f104d3a0082208f5df64 (patch) | |
tree | 74b0d7057ea1b112d7de41f1bbce5e212f1525de /drivers/gpu/nvgpu/gm20b | |
parent | be7f22db8bc5bff131432a4f6d127ecc8ce5096d (diff) |
gpu: nvgpu: move debugfs code to linux module
Since all debugfs code is Linux specific, remove
it from common code and move it to Linux module
Debugfs code is now divided into below
module specific files :
common/linux/debug.c
common/linux/debug_cde.c
common/linux/debug_ce.c
common/linux/debug_fifo.c
common/linux/debug_gr.c
common/linux/debug_mm.c
common/linux/debug_allocator.c
common/linux/debug_kmem.c
common/linux/debug_pmu.c
common/linux/debug_sched.c
Add corresponding header files for above modules too
And compile all of above files only if CONFIG_DEBUG_FS is set
Some more details of the changes made
- Move and rename gk20a/debug_gk20a.c to common/linux/debug.c
- Move and rename gk20a/debug_gk20a.h to include/nvgpu/debug.h
- Remove gm20b/debug_gm20b.c and gm20b/debug_gm20b.h and call
gk20a_init_debug_ops() directly from gm20b_init_hal()
- Update all debug APIs to receive struct gk20a as parameter
instead of receiving struct device pointer
- Update API gk20a_dmabuf_get_state() to receive struct gk20a
pointer instead of struct device
- Include <nvgpu/debug.h> explicitly in all files where debug
operations are used
- Remove "gk20a/platform_gk20a.h" include from HAL files
which no longer need this include
- Add new API gk20a_debug_deinit() to deinitialize debugfs
and call it from gk20a_remove()
- Move API gk20a_debug_dump_all_channel_status_ramfc() to
gk20a/fifo_gk20a.c
Jira NVGPU-62
Change-Id: I076975d3d7f669bdbe9212fa33d98529377feeb6
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/1488902
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/debug_gm20b.c | 21 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/debug_gm20b.h | 24 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/gr_gm20b.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 4 |
4 files changed, 3 insertions, 47 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/debug_gm20b.c b/drivers/gpu/nvgpu/gm20b/debug_gm20b.c deleted file mode 100644 index b266200c..00000000 --- a/drivers/gpu/nvgpu/gm20b/debug_gm20b.c +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2015 NVIDIA Corporation. All rights reserved. | ||
3 | * | ||
4 | * This software is licensed under the terms of the GNU General Public | ||
5 | * License version 2, as published by the Free Software Foundation, and | ||
6 | * may be copied, distributed, and modified under those terms. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | */ | ||
14 | |||
15 | #include "gk20a/gk20a.h" | ||
16 | #include "debug_gm20b.h" | ||
17 | |||
18 | void gm20b_init_debug_ops(struct gpu_ops *gops) | ||
19 | { | ||
20 | gops->debug.show_dump = gk20a_debug_show_dump; | ||
21 | } | ||
diff --git a/drivers/gpu/nvgpu/gm20b/debug_gm20b.h b/drivers/gpu/nvgpu/gm20b/debug_gm20b.h deleted file mode 100644 index c3c5fed6..00000000 --- a/drivers/gpu/nvgpu/gm20b/debug_gm20b.h +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | /* | ||
2 | * GM20B Debug functionality | ||
3 | * | ||
4 | * Copyright (C) 2015 NVIDIA CORPORATION. All rights reserved. | ||
5 | * | ||
6 | * This software is licensed under the terms of the GNU General Public | ||
7 | * License version 2, as published by the Free Software Foundation, and | ||
8 | * may be copied, distributed, and modified under those terms. | ||
9 | * | ||
10 | * This program is distributed in the hope that it will be useful, | ||
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
13 | * GNU General Public License for more details. | ||
14 | * | ||
15 | */ | ||
16 | |||
17 | #ifndef _DEBUG_GM20B_H_ | ||
18 | #define _DEBUG_GM20B_H_ | ||
19 | |||
20 | struct gpu_ops; | ||
21 | |||
22 | void gm20b_init_debug_ops(struct gpu_ops *gops); | ||
23 | |||
24 | #endif | ||
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c index 82c587f9..c6e451e1 100644 --- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <nvgpu/kmem.h> | 20 | #include <nvgpu/kmem.h> |
21 | #include <nvgpu/log.h> | 21 | #include <nvgpu/log.h> |
22 | #include <nvgpu/enabled.h> | 22 | #include <nvgpu/enabled.h> |
23 | #include <nvgpu/debug.h> | ||
23 | 24 | ||
24 | #include "gk20a/gk20a.h" | 25 | #include "gk20a/gk20a.h" |
25 | #include "gk20a/gr_gk20a.h" | 26 | #include "gk20a/gr_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index f5328f03..831fd5da 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c | |||
@@ -33,11 +33,11 @@ | |||
33 | #include "clk_gm20b.h" | 33 | #include "clk_gm20b.h" |
34 | #include "mc_gm20b.h" | 34 | #include "mc_gm20b.h" |
35 | #include "regops_gm20b.h" | 35 | #include "regops_gm20b.h" |
36 | #include "debug_gm20b.h" | ||
37 | #include "cde_gm20b.h" | 36 | #include "cde_gm20b.h" |
38 | #include "therm_gm20b.h" | 37 | #include "therm_gm20b.h" |
39 | #include "hal_gm20b.h" | 38 | #include "hal_gm20b.h" |
40 | 39 | ||
40 | #include <nvgpu/debug.h> | ||
41 | #include <nvgpu/bug.h> | 41 | #include <nvgpu/bug.h> |
42 | #include <nvgpu/enabled.h> | 42 | #include <nvgpu/enabled.h> |
43 | 43 | ||
@@ -234,7 +234,7 @@ int gm20b_init_hal(struct gk20a *g) | |||
234 | gm20b_init_pmu_ops(gops); | 234 | gm20b_init_pmu_ops(gops); |
235 | gm20b_init_clk_ops(gops); | 235 | gm20b_init_clk_ops(gops); |
236 | gm20b_init_regops(gops); | 236 | gm20b_init_regops(gops); |
237 | gm20b_init_debug_ops(gops); | 237 | gk20a_init_debug_ops(gops); |
238 | gk20a_init_dbg_session_ops(gops); | 238 | gk20a_init_dbg_session_ops(gops); |
239 | gm20b_init_cde_ops(gops); | 239 | gm20b_init_cde_ops(gops); |
240 | gm20b_init_therm_ops(gops); | 240 | gm20b_init_therm_ops(gops); |