diff options
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gm20b/vgpu_hal_gm20b.c | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | 7 |
2 files changed, 0 insertions, 12 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_hal_gm20b.c b/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_hal_gm20b.c index 618c80f8..fc9b0e83 100644 --- a/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_hal_gm20b.c +++ b/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_hal_gm20b.c | |||
@@ -42,7 +42,6 @@ | |||
42 | #include "gm20b/pmu_gm20b.h" | 42 | #include "gm20b/pmu_gm20b.h" |
43 | #include "gm20b/fb_gm20b.h" | 43 | #include "gm20b/fb_gm20b.h" |
44 | #include "gm20b/bus_gm20b.h" | 44 | #include "gm20b/bus_gm20b.h" |
45 | #include "gm20b/cde_gm20b.h" | ||
46 | #include "gm20b/regops_gm20b.h" | 45 | #include "gm20b/regops_gm20b.h" |
47 | #include "gm20b/clk_gm20b.h" | 46 | #include "gm20b/clk_gm20b.h" |
48 | #include "gm20b/therm_gm20b.h" | 47 | #include "gm20b/therm_gm20b.h" |
@@ -438,9 +437,6 @@ static const struct gpu_ops vgpu_gm20b_ops = { | |||
438 | .perfbuffer_enable = vgpu_perfbuffer_enable, | 437 | .perfbuffer_enable = vgpu_perfbuffer_enable, |
439 | .perfbuffer_disable = vgpu_perfbuffer_disable, | 438 | .perfbuffer_disable = vgpu_perfbuffer_disable, |
440 | }, | 439 | }, |
441 | .cde = { | ||
442 | .get_program_numbers = gm20b_cde_get_program_numbers, | ||
443 | }, | ||
444 | .bus = { | 440 | .bus = { |
445 | .init_hw = gk20a_bus_init_hw, | 441 | .init_hw = gk20a_bus_init_hw, |
446 | .isr = gk20a_bus_isr, | 442 | .isr = gk20a_bus_isr, |
@@ -501,7 +497,6 @@ int vgpu_gm20b_init_hal(struct gk20a *g) | |||
501 | gops->mc = vgpu_gm20b_ops.mc; | 497 | gops->mc = vgpu_gm20b_ops.mc; |
502 | gops->dbg_session_ops = vgpu_gm20b_ops.dbg_session_ops; | 498 | gops->dbg_session_ops = vgpu_gm20b_ops.dbg_session_ops; |
503 | gops->debug = vgpu_gm20b_ops.debug; | 499 | gops->debug = vgpu_gm20b_ops.debug; |
504 | gops->cde = vgpu_gm20b_ops.cde; | ||
505 | gops->bus = vgpu_gm20b_ops.bus; | 500 | gops->bus = vgpu_gm20b_ops.bus; |
506 | #if defined(CONFIG_GK20A_CYCLE_STATS) | 501 | #if defined(CONFIG_GK20A_CYCLE_STATS) |
507 | gops->css = vgpu_gm20b_ops.css; | 502 | gops->css = vgpu_gm20b_ops.css; |
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c index aae74e3f..2c59d847 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | |||
@@ -50,7 +50,6 @@ | |||
50 | #include "gp10b/fifo_gp10b.h" | 50 | #include "gp10b/fifo_gp10b.h" |
51 | #include "gp10b/gp10b_gating_reglist.h" | 51 | #include "gp10b/gp10b_gating_reglist.h" |
52 | #include "gp10b/regops_gp10b.h" | 52 | #include "gp10b/regops_gp10b.h" |
53 | #include "gp10b/cde_gp10b.h" | ||
54 | #include "gp10b/therm_gp10b.h" | 53 | #include "gp10b/therm_gp10b.h" |
55 | #include "gp10b/priv_ring_gp10b.h" | 54 | #include "gp10b/priv_ring_gp10b.h" |
56 | 55 | ||
@@ -478,11 +477,6 @@ static const struct gpu_ops vgpu_gp10b_ops = { | |||
478 | .perfbuffer_enable = vgpu_perfbuffer_enable, | 477 | .perfbuffer_enable = vgpu_perfbuffer_enable, |
479 | .perfbuffer_disable = vgpu_perfbuffer_disable, | 478 | .perfbuffer_disable = vgpu_perfbuffer_disable, |
480 | }, | 479 | }, |
481 | .cde = { | ||
482 | .get_program_numbers = gp10b_cde_get_program_numbers, | ||
483 | .need_scatter_buffer = gp10b_need_scatter_buffer, | ||
484 | .populate_scatter_buffer = gp10b_populate_scatter_buffer, | ||
485 | }, | ||
486 | .bus = { | 480 | .bus = { |
487 | .init_hw = gk20a_bus_init_hw, | 481 | .init_hw = gk20a_bus_init_hw, |
488 | .isr = gk20a_bus_isr, | 482 | .isr = gk20a_bus_isr, |
@@ -533,7 +527,6 @@ int vgpu_gp10b_init_hal(struct gk20a *g) | |||
533 | gops->mc = vgpu_gp10b_ops.mc; | 527 | gops->mc = vgpu_gp10b_ops.mc; |
534 | gops->debug = vgpu_gp10b_ops.debug; | 528 | gops->debug = vgpu_gp10b_ops.debug; |
535 | gops->dbg_session_ops = vgpu_gp10b_ops.dbg_session_ops; | 529 | gops->dbg_session_ops = vgpu_gp10b_ops.dbg_session_ops; |
536 | gops->cde = vgpu_gp10b_ops.cde; | ||
537 | gops->bus = vgpu_gp10b_ops.bus; | 530 | gops->bus = vgpu_gp10b_ops.bus; |
538 | #if defined(CONFIG_GK20A_CYCLE_STATS) | 531 | #if defined(CONFIG_GK20A_CYCLE_STATS) |
539 | gops->css = vgpu_gp10b_ops.css; | 532 | gops->css = vgpu_gp10b_ops.css; |