diff options
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gr_vgpu.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | 5 |
3 files changed, 11 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c index bfdd0788..861f6c00 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | |||
@@ -39,6 +39,7 @@ | |||
39 | #include "gk20a/flcn_gk20a.h" | 39 | #include "gk20a/flcn_gk20a.h" |
40 | #include "gk20a/mc_gk20a.h" | 40 | #include "gk20a/mc_gk20a.h" |
41 | #include "gk20a/fb_gk20a.h" | 41 | #include "gk20a/fb_gk20a.h" |
42 | #include "gk20a/dbg_gpu_gk20a.h" | ||
42 | 43 | ||
43 | #include "gp10b/mc_gp10b.h" | 44 | #include "gp10b/mc_gp10b.h" |
44 | #include "gp10b/ltc_gp10b.h" | 45 | #include "gp10b/ltc_gp10b.h" |
@@ -478,6 +479,9 @@ static const struct gpu_ops vgpu_gp10b_ops = { | |||
478 | .debug = { | 479 | .debug = { |
479 | .show_dump = NULL, | 480 | .show_dump = NULL, |
480 | }, | 481 | }, |
482 | .debugger = { | ||
483 | .post_events = gk20a_dbg_gpu_post_events, | ||
484 | }, | ||
481 | .dbg_session_ops = { | 485 | .dbg_session_ops = { |
482 | .exec_reg_ops = vgpu_exec_regops, | 486 | .exec_reg_ops = vgpu_exec_regops, |
483 | .dbg_set_powergate = vgpu_dbg_set_powergate, | 487 | .dbg_set_powergate = vgpu_dbg_set_powergate, |
@@ -542,6 +546,7 @@ int vgpu_gp10b_init_hal(struct gk20a *g) | |||
542 | gops->regops = vgpu_gp10b_ops.regops; | 546 | gops->regops = vgpu_gp10b_ops.regops; |
543 | gops->mc = vgpu_gp10b_ops.mc; | 547 | gops->mc = vgpu_gp10b_ops.mc; |
544 | gops->debug = vgpu_gp10b_ops.debug; | 548 | gops->debug = vgpu_gp10b_ops.debug; |
549 | gops->debugger = vgpu_gp10b_ops.debugger; | ||
545 | gops->dbg_session_ops = vgpu_gp10b_ops.dbg_session_ops; | 550 | gops->dbg_session_ops = vgpu_gp10b_ops.dbg_session_ops; |
546 | gops->bus = vgpu_gp10b_ops.bus; | 551 | gops->bus = vgpu_gp10b_ops.bus; |
547 | #if defined(CONFIG_GK20A_CYCLE_STATS) | 552 | #if defined(CONFIG_GK20A_CYCLE_STATS) |
diff --git a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c index ee5a5d36..d04beb56 100644 --- a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c | |||
@@ -951,7 +951,7 @@ int vgpu_gr_isr(struct gk20a *g, struct tegra_vgpu_gr_intr_info *info) | |||
951 | NVGPU_ERR_NOTIFIER_GR_ERROR_SW_NOTIFY); | 951 | NVGPU_ERR_NOTIFIER_GR_ERROR_SW_NOTIFY); |
952 | break; | 952 | break; |
953 | case TEGRA_VGPU_GR_INTR_SM_EXCEPTION: | 953 | case TEGRA_VGPU_GR_INTR_SM_EXCEPTION: |
954 | gk20a_dbg_gpu_post_events(ch); | 954 | g->ops.debugger.post_events(ch); |
955 | break; | 955 | break; |
956 | default: | 956 | default: |
957 | WARN_ON(1); | 957 | WARN_ON(1); |
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c index b4e03ecd..01b31976 100644 --- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | |||
@@ -39,6 +39,7 @@ | |||
39 | #include <gk20a/flcn_gk20a.h> | 39 | #include <gk20a/flcn_gk20a.h> |
40 | #include <gk20a/bus_gk20a.h> | 40 | #include <gk20a/bus_gk20a.h> |
41 | #include <gk20a/mc_gk20a.h> | 41 | #include <gk20a/mc_gk20a.h> |
42 | #include "gk20a/dbg_gpu_gk20a.h" | ||
42 | 43 | ||
43 | #include <gm20b/gr_gm20b.h> | 44 | #include <gm20b/gr_gm20b.h> |
44 | #include <gm20b/fb_gm20b.h> | 45 | #include <gm20b/fb_gm20b.h> |
@@ -525,6 +526,9 @@ static const struct gpu_ops vgpu_gv11b_ops = { | |||
525 | .debug = { | 526 | .debug = { |
526 | .show_dump = NULL, | 527 | .show_dump = NULL, |
527 | }, | 528 | }, |
529 | .debugger = { | ||
530 | .post_events = gk20a_dbg_gpu_post_events, | ||
531 | }, | ||
528 | .dbg_session_ops = { | 532 | .dbg_session_ops = { |
529 | .exec_reg_ops = vgpu_exec_regops, | 533 | .exec_reg_ops = vgpu_exec_regops, |
530 | .dbg_set_powergate = vgpu_dbg_set_powergate, | 534 | .dbg_set_powergate = vgpu_dbg_set_powergate, |
@@ -585,6 +589,7 @@ int vgpu_gv11b_init_hal(struct gk20a *g) | |||
585 | gops->regops = vgpu_gv11b_ops.regops; | 589 | gops->regops = vgpu_gv11b_ops.regops; |
586 | gops->mc = vgpu_gv11b_ops.mc; | 590 | gops->mc = vgpu_gv11b_ops.mc; |
587 | gops->debug = vgpu_gv11b_ops.debug; | 591 | gops->debug = vgpu_gv11b_ops.debug; |
592 | gops->debugger = vgpu_gv11b_ops.debugger; | ||
588 | gops->dbg_session_ops = vgpu_gv11b_ops.dbg_session_ops; | 593 | gops->dbg_session_ops = vgpu_gv11b_ops.dbg_session_ops; |
589 | gops->bus = vgpu_gv11b_ops.bus; | 594 | gops->bus = vgpu_gv11b_ops.bus; |
590 | #if defined(CONFIG_GK20A_CYCLE_STATS) | 595 | #if defined(CONFIG_GK20A_CYCLE_STATS) |