diff options
author | Lakshmanan M <lm@nvidia.com> | 2016-06-02 00:09:52 -0400 |
---|---|---|
committer | Deepak Nibade <dnibade@nvidia.com> | 2016-12-27 04:56:17 -0500 |
commit | 9454529abe0ac42d15df01e36898cd2c840de9c8 (patch) | |
tree | 6d965a08f74b72aa948edcb224a4f753d86f3b90 /drivers/gpu/nvgpu/gp10b/gr_gp10b.c | |
parent | c8569f1ebfcdd4546d3674458684c7e1315872a4 (diff) |
gpu: nvgpu: Add multiple engine and runlist support
This CL covers the following modification,
1) Added multiple engine_info support
2) Added multiple runlist_info support
3) Initial changes for ASYNC CE support
4) Added ASYNC CE interrupt support for
Pascal GPU series
5) Removed hard coded engine_id logic and
made generic way
6) Code cleanup for readability
JIRA DNVGPU-26
Change-Id: Ibf46a89a5308c82f01040ffa979c5014b3206f8e
Signed-off-by: Lakshmanan M <lm@nvidia.com>
Reviewed-on: http://git-master/r/1156022
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b/gr_gp10b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/gr_gp10b.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c index 2ba18410..607fca59 100644 --- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c | |||
@@ -1182,6 +1182,9 @@ static int gr_gp10b_dump_gr_status_regs(struct gk20a *g, | |||
1182 | struct gk20a_debug_output *o) | 1182 | struct gk20a_debug_output *o) |
1183 | { | 1183 | { |
1184 | struct gr_gk20a *gr = &g->gr; | 1184 | struct gr_gk20a *gr = &g->gr; |
1185 | u32 gr_engine_id; | ||
1186 | |||
1187 | gr_engine_id = gk20a_fifo_get_gr_engine_id(g); | ||
1185 | 1188 | ||
1186 | gk20a_debug_output(o, "NV_PGRAPH_STATUS: 0x%x\n", | 1189 | gk20a_debug_output(o, "NV_PGRAPH_STATUS: 0x%x\n", |
1187 | gk20a_readl(g, gr_status_r())); | 1190 | gk20a_readl(g, gr_status_r())); |
@@ -1202,7 +1205,7 @@ static int gr_gp10b_dump_gr_status_regs(struct gk20a *g, | |||
1202 | gk20a_debug_output(o, "NV_PGRAPH_FECS_INTR : 0x%x\n", | 1205 | gk20a_debug_output(o, "NV_PGRAPH_FECS_INTR : 0x%x\n", |
1203 | gk20a_readl(g, gr_fecs_intr_r())); | 1206 | gk20a_readl(g, gr_fecs_intr_r())); |
1204 | gk20a_debug_output(o, "NV_PFIFO_ENGINE_STATUS(GR) : 0x%x\n", | 1207 | gk20a_debug_output(o, "NV_PFIFO_ENGINE_STATUS(GR) : 0x%x\n", |
1205 | gk20a_readl(g, fifo_engine_status_r(ENGINE_GR_GK20A))); | 1208 | gk20a_readl(g, fifo_engine_status_r(gr_engine_id))); |
1206 | gk20a_debug_output(o, "NV_PGRAPH_ACTIVITY0: 0x%x\n", | 1209 | gk20a_debug_output(o, "NV_PGRAPH_ACTIVITY0: 0x%x\n", |
1207 | gk20a_readl(g, gr_activity_0_r())); | 1210 | gk20a_readl(g, gr_activity_0_r())); |
1208 | gk20a_debug_output(o, "NV_PGRAPH_ACTIVITY1: 0x%x\n", | 1211 | gk20a_debug_output(o, "NV_PGRAPH_ACTIVITY1: 0x%x\n", |