diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index 3224e29c..0c8bc6f4 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |||
@@ -513,7 +513,7 @@ static int gk20a_init_fifo_setup_sw(struct gk20a *g) | |||
513 | mutex_init(&f->intr.isr.mutex); | 513 | mutex_init(&f->intr.isr.mutex); |
514 | gk20a_init_fifo_pbdma_intr_descs(f); /* just filling in data/tables */ | 514 | gk20a_init_fifo_pbdma_intr_descs(f); /* just filling in data/tables */ |
515 | 515 | ||
516 | f->num_channels = ccsr_channel__size_1_v(); | 516 | f->num_channels = g->ops.fifo.get_num_fifos(g); |
517 | f->num_pbdma = proj_host_num_pbdma_v(); | 517 | f->num_pbdma = proj_host_num_pbdma_v(); |
518 | f->max_engines = ENGINE_INVAL_GK20A; | 518 | f->max_engines = ENGINE_INVAL_GK20A; |
519 | 519 | ||
@@ -2132,6 +2132,11 @@ static void gk20a_fifo_apply_pb_timeout(struct gk20a *g) | |||
2132 | } | 2132 | } |
2133 | } | 2133 | } |
2134 | 2134 | ||
2135 | static u32 gk20a_fifo_get_num_fifos(struct gk20a *g) | ||
2136 | { | ||
2137 | return ccsr_channel__size_1_v(); | ||
2138 | } | ||
2139 | |||
2135 | void gk20a_init_fifo(struct gpu_ops *gops) | 2140 | void gk20a_init_fifo(struct gpu_ops *gops) |
2136 | { | 2141 | { |
2137 | gk20a_init_channel(gops); | 2142 | gk20a_init_channel(gops); |
@@ -2140,4 +2145,5 @@ void gk20a_init_fifo(struct gpu_ops *gops) | |||
2140 | gops->fifo.trigger_mmu_fault = gk20a_fifo_trigger_mmu_fault; | 2145 | gops->fifo.trigger_mmu_fault = gk20a_fifo_trigger_mmu_fault; |
2141 | gops->fifo.apply_pb_timeout = gk20a_fifo_apply_pb_timeout; | 2146 | gops->fifo.apply_pb_timeout = gk20a_fifo_apply_pb_timeout; |
2142 | gops->fifo.wait_engine_idle = gk20a_fifo_wait_engine_idle; | 2147 | gops->fifo.wait_engine_idle = gk20a_fifo_wait_engine_idle; |
2148 | gops->fifo.get_num_fifos = gk20a_fifo_get_num_fifos; | ||
2143 | } | 2149 | } |